summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/de/includes/autogen_api_infos.de.adoc10
-rw-r--r--doc/de/includes/autogen_user_commands.de.adoc142
-rw-r--r--doc/de/includes/autogen_user_options.de.adoc32
-rw-r--r--doc/en/includes/autogen_api_infos.en.adoc10
-rw-r--r--doc/en/includes/autogen_user_commands.en.adoc10
-rw-r--r--doc/en/includes/autogen_user_options.en.adoc32
-rw-r--r--doc/fr/includes/autogen_api_infos.fr.adoc10
-rw-r--r--doc/fr/includes/autogen_user_commands.fr.adoc10
-rw-r--r--doc/fr/includes/autogen_user_options.fr.adoc32
-rw-r--r--doc/it/includes/autogen_api_infos.it.adoc10
-rw-r--r--doc/it/includes/autogen_user_commands.it.adoc10
-rw-r--r--doc/it/includes/autogen_user_options.it.adoc32
-rw-r--r--doc/ja/includes/autogen_api_infos.ja.adoc10
-rw-r--r--doc/ja/includes/autogen_user_commands.ja.adoc140
-rw-r--r--doc/ja/includes/autogen_user_options.ja.adoc32
-rw-r--r--doc/pl/includes/autogen_api_infos.pl.adoc10
-rw-r--r--doc/pl/includes/autogen_user_commands.pl.adoc142
-rw-r--r--doc/pl/includes/autogen_user_options.pl.adoc32
18 files changed, 377 insertions, 329 deletions
diff --git a/doc/de/includes/autogen_api_infos.de.adoc b/doc/de/includes/autogen_api_infos.de.adoc
index 056d0fce3..0a32d24c3 100644
--- a/doc/de/includes/autogen_api_infos.de.adoc
+++ b/doc/de/includes/autogen_api_infos.de.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | WeeChat-Version (als Zahl) | -
+| weechat | weechat_cache_dir | WeeChat cache directory | -
+
+| weechat | weechat_config_dir | WeeChat config directory | -
+
| weechat | weechat_daemon | 1, falls WeeChat im Daemon-Modus ausgeführt wird (ohne Oberfläche, im Hintergrund) | -
-| weechat | weechat_dir | WeeChat Verzeichnis | -
+| weechat | weechat_data_dir | WeeChat data directory | -
+
+| weechat | weechat_dir | WeeChat directory (*deprecated* since version 3.2, replaced by "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" and "weechat_runtime_dir") | -
| weechat | weechat_headless | 1, falls WeeChat im Hintergrundmodus ausgeführt wird | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | "lokales" Verzeichnis von WeeChat | -
+| weechat | weechat_runtime_dir | WeeChat runtime directory | -
+
| weechat | weechat_sharedir | WeeChat "share" Verzeichnis | -
| weechat | weechat_site | WeeChat Seite | -
diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc
index db82c10cb..e602cd984 100644
--- a/doc/de/includes/autogen_user_commands.de.adoc
+++ b/doc/de/includes/autogen_user_commands.de.adoc
@@ -1958,30 +1958,30 @@ Beispiele:
----
/upgrade [-yes] [<path_to_binary>|-quit]
- -yes: wird benötigt, sobald Option "weechat.look.confirm_upgrade" aktiviert ist
-path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei)
- -dummy: ohne Funktion (dient lediglich dazu, um nicht versehentlich die "-quit" Funktion auszuführen)
- -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe unten)
+ -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+ -dummy: do nothing (option used to prevent accidental completion with "-quit")
+ -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
-Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein.
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
-Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt.
+Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
-Der Upgrade Vorgang besteht aus vier Schritten:
- 1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, history, ..)
- 2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert)
- 3. Sicherung der WeeChat Konfiguration (weechat.conf)
- 4. ausführen der neuen Version von WeeChat und wiederherstellen der Sitzung.
+Upgrade process has 4 steps:
+ 1. save session into files for core and plugins (buffers, history, ..)
+ 2. unload all plugins (configuration files (*.conf) are written on disk)
+ 3. save WeeChat configuration (weechat.conf)
+ 4. execute new WeeChat binary and reload session.
-Nutzt man die "-quit" Funktion ist die Abfolge geringfügig anders:
- 1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...)
- 2. die Sitzung wird in Dateien gesichert (*.upgrade)
- 3. alle Erweiterungen werden ausgeschaltet
- 4. die WeeChat Konfiguration wird gesichert
- 5. WeeChat wird beendet
-Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat --upgrade
-WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien wiederhergestellt werden (*.conf)
-Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen, sofern man den Inhalt des "~/.weechat" Verzeichnisses dorthin kopiert.
+With option "-quit", the process is slightly different:
+ 1. close *ALL* connections (irc, xfer, relay, ...)
+ 2. save session into files (*.upgrade)
+ 3. unload all plugins
+ 4. save WeeChat configuration
+ 5. quit WeeChat
+Then later you can restore session with command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
----
[[command_weechat_uptime]]
@@ -2267,23 +2267,23 @@ Beispiele:
----
/fifo enable|disable|toggle
- enable: aktivieren der FIFO pipe
-disable: deaktivieren der FIFO pipe
- toggle: Status der FIFO pipe umschalten
+ enable: enable FIFO pipe
+disable: disable FIFO pipe
+ toggle: toggle FIFO pipe
-Die FIFO-Pipe wird als Fernbedienung genutzt, es können Befehle oder Text von der Shell an die FIFO-Pipe geschickt werden
-Standardmäßig ist die FIFO-Pipe in ~/.weechat/weechat_fifo
+FIFO pipe is used as remote control of WeeChat: you can send commands or text to the FIFO pipe from your shell.
+By default the FIFO pipe is called weechat_fifo_xxx (where xxx is the WeeChat process id) and located in the WeeChat runtime directory (see /debug dirs).
-Folgendes Format wird erwartet:
- plugin.buffer *Text oder Befehl an dieser Stelle
- *Text oder Befehl an dieser Stelle
+The expected format is one of:
+ plugin.buffer *text or command here
+ *text or command here
-Beispiel um den eigenen Nick auf dem Server freenode zu ändern:
- echo 'irc.server.freenode */nick newnick' >~/.weechat/weechat_fifo
+For example to change your freenode nick:
+ echo 'irc.server.freenode */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
-Bitte lese die Benutzeranleitung für weitere Informationen und Beispiele.
+Please read the user's guide for more info and examples.
-Beispiele:
+Examples:
/fifo toggle
----
// end::fifo_commands[]
@@ -2706,53 +2706,53 @@ Ohne Angabe eines Argumentes listet dieser Befehl alle geladenen Skripten auf.
raw
sslcertkey
- list: Auflistung der Relay-Clients (nur aktive Relays)
- listfull: detaillierte Auflistung der Relay-Clients (alle Relays)
- listrelay: Auflistung der Relays (Name und Port)
- add: fügt ein Relay, für ein Protokoll + Name, hinzu
- del: entfernt Relay für ein Protokoll + Name
- start: lausche am Port
- restart: beendet den Server Socket und lauscht erneut am Port (Clients bleiben verbunden)
- stop: schließt den Server Socket (Clients bleiben verbunden)
- name: Name des Relays (siehe Format weiter unten)
- port: Port der für Relay genutzt werden soll
- path: Pfad der für Relay genutzt werden soll (ausschließlich für UNIX Domain Socket); "%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: ("~/.weechat"), Inhalt ist evaluiert (siehe /help eval)
- raw: öffnet einen Buffer mit Relay-Rohdaten
- sslcertkey: setzt SSL Zertifikat/Schlüssel mittels Pfad in Einstellung relay.network.ssl_cert_key
-
-Aufbau des Relay-Namens: [ipv4.][ipv6.][ssl.]<Protokoll.Name> oder unix.[ssl.]<Protokoll.Name>
- ipv4: erzwingt die Nutzung von IPv4
- ipv6: erzwingt die Nutzung von IPv6
- ssl: aktiviert SSL
- unix: nutzt UNIX Domain Socket
-protocol.name: Protokoll und Name des Relay:
- - Protokoll "irc": Name des Servers welcher geteilt werden soll (optional. Falls kein Name angegeben wird, muss der Client einen Namen mit dem Befehl "PASS" übermitteln, das Format ist wie folgt: "PASS Server:Passwort")
- - Protokoll "weechat" (es wird kein Name verwendet)
-
-Das "irc" Protokoll dient dazu eine Verbindung zu einem anderen IRC Client (oder zu einem zweiten WeeChat) herzustellen.
-Das "weechat" Protokoll wird von einem Remote-Interface genutzt um eine Verbindung auf dem Port herzustellen. Siehe https://weechat.org/about/interfaces
-
-Ohne Angabe von Argumenten werden alle Relay-Clients in einem neuen Buffer dargestellt.
-
-Beispiele:
- IRC Proxy für Server "freenode":
+ list: list relay clients (only active relays)
+ listfull: list relay clients (verbose, all relays)
+ listrelay: list relays (name and port)
+ add: add a relay (listen on a port/path)
+ del: remove a relay (clients remain connected)
+ start: listen on port
+ restart: close the server socket and listen again on port (clients remain connected)
+ stop: close the server socket (clients remain connected)
+ name: relay name (see format below)
+ port: port used for relay
+ path: path used for relay (for UNIX domain socket only); path is evaluated (see function string_eval_path_home in plugin API reference)
+ raw: open buffer with raw Relay data
+ sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
+
+Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name> or unix.[ssl.]<protocol.name>
+ ipv4: force use of IPv4
+ ipv6: force use of IPv6
+ ssl: enable SSL
+ unix: use UNIX domain socket
+protocol.name: protocol and name to relay:
+ - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
+ - protocol "weechat" (name is not used)
+
+The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
+The "weechat" protocol allows a remote interface to connect on the port, see the list here: https://weechat.org/about/interfaces
+
+Without argument, this command opens buffer with list of relay clients.
+
+Examples:
+ irc proxy, for server "freenode":
/relay add irc.freenode 8000
- IRC Proxy, für Server "freenode", mit SSL:
+ irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
- IRC Proxy für alle Server (Client wählt aus), mit SSL:
+ irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
- WeeChat Protokoll:
+ weechat protocol:
/relay add weechat 9000
- WeeChat Protokoll, mit SSL:
+ weechat protocol with SSL:
/relay add ssl.weechat 9001
- WeeChat Protokoll, mit SSL, nur IPv4 nutzen:
+ weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
- WeeChat Protokoll, mit SSL, nur IPv6 nutzen:
+ weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
- WeeChat Protokoll, mit SSL, mit IPv4 + IPv6:
+ weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
- Weechat Protokoll über UNIX Domain Socket:
- /relay add unix.weechat %h/relay_socket
+ weechat protocol over UNIX domain socket:
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/de/includes/autogen_user_options.de.adoc b/doc/de/includes/autogen_user_options.de.adoc
index e2cd0b5f3..8916bd2fe 100644
--- a/doc/de/includes/autogen_user_options.de.adoc
+++ b/doc/de/includes/autogen_user_options.de.adoc
@@ -1261,7 +1261,7 @@
** Standardwert: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** Beschreibung: pass:none[Datei beinhaltet die digitalen Zertifikate ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")]
+** Beschreibung: pass:none[file containing the certificate authorities (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
** Standardwert: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** Standardwert: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** Beschreibung: pass:none[Suchpfad für Erweiterungen ("%h"' wird durch das WeeChat-Basisverzeichnis ersetzt, voreingestellt ist "~/.weechat")]
+** Beschreibung: pass:none[path for searching plugins (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/plugins"+`
+** Standardwert: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** Beschreibung: pass:none[speichert Konfigurationen, falls Erweiterungen beendet werden]
@@ -1451,10 +1451,10 @@
** Standardwert: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** Beschreibung: pass:none[Pfad für WeeChat Protokolldateien; "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat"); eine Datumsspezifikation ist zulässig (siehe: man strftime) (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[path for WeeChat log files; date specifiers are permitted (see man strftime) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/logs/"+`
+** Standardwert: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** Beschreibung: pass:none[Ersatzzeichen für Dateinamen, falls der Dateiname Sonderzeichen beinhaltet (z.B. das Trennzeichen bei Verzeichnissen "/")]
@@ -1827,10 +1827,10 @@
** Standardwert: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** Beschreibung: pass:none[Pfad für eingehende Dateien: "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat"); WeeChat PID kann mit ${info:pid} genutzt werden (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[path for FIFO file; WeeChat PID can be used in path with ${info:pid} (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/weechat_fifo"+`
+** Standardwert: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** Standardwert: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** Beschreibung: pass:none[Pfad für eingehende Dateien: "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat") (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[path for writing incoming files (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/xfer"+`
+** Standardwert: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** Beschreibung: pass:none[Dateiendung der temporären Datei, die während eines eingehenden Datei-Transfers genutzt wird und die gelöscht wird, sobald die Übertragung erfolgreich beendet wurde; wenn -leer-, dann wird keine temporäre Dateiendung während des Transfers genutzt]
@@ -1943,7 +1943,7 @@
** Standardwert: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** Beschreibung: pass:none[Pfad für ausgehende Dateien (falls kein Pfad durch den Anwender angegeben wurde): "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat") (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[path for reading files when sending (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
** Standardwert: `+"~"+`
@@ -2743,7 +2743,7 @@
** Standardwert: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** Beschreibung: pass:none[Datei mit privatem ECC Schlüssel für den "ecdsa-nist256p-challenge" Mechanismus ("%h" wird durch das WeeChat Verzeichnis ersetzt, standardmäßig "~/.weechat")]
+** Beschreibung: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
** Standardwert: `+""+`
@@ -2785,7 +2785,7 @@
** Standardwert: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** Beschreibung: pass:none[Datei für SSL Zertifikat um automatisch den eigenen Nick zu identifizieren ("%h" wird durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: "~/.weechat")]
+** Beschreibung: pass:none[SSL certificate file used to automatically identify your nick (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
** Standardwert: `+""+`
@@ -3009,10 +3009,10 @@
** Standardwert: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** Beschreibung: pass:none[Datei mit SSL Zertifikat und privatem Schlüssel (zur Nutzung von Clients mit SSL)]
+** Beschreibung: pass:none[file with SSL certificate and private key (for serving clients with SSL) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/ssl/relay.pem"+`
+** Standardwert: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** Beschreibung: pass:none[Zeichenkette mit Prioritäten für gnutls (für die korrekte Syntax siehe gnutls Dokumentation unter Funktion gnutls_priority_init. Gebräuchliche Zeichenketten sind: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** Standardwert: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** Beschreibung: pass:none[lokales Cache-Verzeichnis für die Script-Erweiterung; "%h" wird durch das WeeChat Verzeichnis ersetzt (Standardpfad: "~/.weechat") (Hinweis: Inhalt wird evaluiert, siehe /help eval)]
+** Beschreibung: pass:none[local cache directory for scripts (path is evaluated, see function string_eval_path_home in plugin API reference)]
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette
-** Standardwert: `+"%h/script"+`
+** Standardwert: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** Beschreibung: pass:none[URL für Datei mit der Auflistung aller Skripten]
diff --git a/doc/en/includes/autogen_api_infos.en.adoc b/doc/en/includes/autogen_api_infos.en.adoc
index e2038de17..d5a231d07 100644
--- a/doc/en/includes/autogen_api_infos.en.adoc
+++ b/doc/en/includes/autogen_api_infos.en.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | WeeChat version (as number) | -
+| weechat | weechat_cache_dir | WeeChat cache directory | -
+
+| weechat | weechat_config_dir | WeeChat config directory | -
+
| weechat | weechat_daemon | 1 if WeeChat is running in daemon mode (headless, in background) | -
-| weechat | weechat_dir | WeeChat directory | -
+| weechat | weechat_data_dir | WeeChat data directory | -
+
+| weechat | weechat_dir | WeeChat directory (*deprecated* since version 3.2, replaced by "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" and "weechat_runtime_dir") | -
| weechat | weechat_headless | 1 if WeeChat is running headless | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | WeeChat "locale" directory | -
+| weechat | weechat_runtime_dir | WeeChat runtime directory | -
+
| weechat | weechat_sharedir | WeeChat "share" directory | -
| weechat | weechat_site | WeeChat site | -
diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc
index 8eefbdbdc..2c72f5a5c 100644
--- a/doc/en/includes/autogen_user_commands.en.adoc
+++ b/doc/en/includes/autogen_user_commands.en.adoc
@@ -1981,7 +1981,7 @@ With option "-quit", the process is slightly different:
5. quit WeeChat
Then later you can restore session with command: weechat --upgrade
IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
-It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
----
[[command_weechat_uptime]]
@@ -2272,14 +2272,14 @@ disable: disable FIFO pipe
toggle: toggle FIFO pipe
FIFO pipe is used as remote control of WeeChat: you can send commands or text to the FIFO pipe from your shell.
-By default the FIFO pipe is in ~/.weechat/weechat_fifo
+By default the FIFO pipe is called weechat_fifo_xxx (where xxx is the WeeChat process id) and located in the WeeChat runtime directory (see /debug dirs).
The expected format is one of:
plugin.buffer *text or command here
*text or command here
For example to change your freenode nick:
- echo 'irc.server.freenode */nick newnick' >~/.weechat/weechat_fifo
+ echo 'irc.server.freenode */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
Please read the user's guide for more info and examples.
@@ -2716,7 +2716,7 @@ Without argument, this command lists all loaded scripts.
stop: close the server socket (clients remain connected)
name: relay name (see format below)
port: port used for relay
- path: path used for relay (for UNIX domain socket only); "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default), content is evaluated (see /help eval)
+ path: path used for relay (for UNIX domain socket only); path is evaluated (see function string_eval_path_home in plugin API reference)
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
@@ -2752,7 +2752,7 @@ Examples:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
weechat protocol over UNIX domain socket:
- /relay add unix.weechat %h/relay_socket
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/en/includes/autogen_user_options.en.adoc b/doc/en/includes/autogen_user_options.en.adoc
index 20f2978a9..ec443d0b4 100644
--- a/doc/en/includes/autogen_user_options.en.adoc
+++ b/doc/en/includes/autogen_user_options.en.adoc
@@ -1261,7 +1261,7 @@
** default value: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** description: pass:none[file containing the certificate authorities ("%h" will be replaced by WeeChat home, "~/.weechat" by default)]
+** description: pass:none[file containing the certificate authorities (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
** default value: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** default value: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** description: pass:none[path for searching plugins ("%h" will be replaced by WeeChat home, "~/.weechat" by default)]
+** description: pass:none[path for searching plugins (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/plugins"+`
+** default value: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** description: pass:none[save configuration files when unloading plugins]
@@ -1451,10 +1451,10 @@
** default value: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** description: pass:none[path for WeeChat log files; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default); date specifiers are permitted (see man strftime) (note: content is evaluated, see /help eval)]
+** description: pass:none[path for WeeChat log files; date specifiers are permitted (see man strftime) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/logs/"+`
+** default value: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** description: pass:none[replacement char for special chars in filename built with mask (like directory delimiter)]
@@ -1827,10 +1827,10 @@
** default value: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** description: pass:none[path for FIFO file; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default); WeeChat PID can be used in path with ${info:pid} (note: content is evaluated, see /help eval)]
+** description: pass:none[path for FIFO file; WeeChat PID can be used in path with ${info:pid} (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/weechat_fifo"+`
+** default value: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** default value: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** description: pass:none[path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** description: pass:none[path for writing incoming files (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/xfer"+`
+** default value: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** description: pass:none[temporary filename suffix used during the transfer for a file received, it is removed after successful transfer; if empty string, no filename suffix is used during the transfer]
@@ -1943,7 +1943,7 @@
** default value: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** description: pass:none[path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** description: pass:none[path for reading files when sending (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
** default value: `+"~"+`
@@ -2743,7 +2743,7 @@
** default value: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** description: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" ("%h" will be replaced by WeeChat home, "~/.weechat" by default)]
+** description: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
** default value: `+""+`
@@ -2785,7 +2785,7 @@
** default value: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** description: pass:none[SSL certificate file used to automatically identify your nick ("%h" will be replaced by WeeChat home, "~/.weechat" by default)]
+** description: pass:none[SSL certificate file used to automatically identify your nick (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
** default value: `+""+`
@@ -3009,10 +3009,10 @@
** default value: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** description: pass:none[file with SSL certificate and private key (for serving clients with SSL)]
+** description: pass:none[file with SSL certificate and private key (for serving clients with SSL) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/ssl/relay.pem"+`
+** default value: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** description: pass:none[string with priorities for gnutls (for syntax, see documentation of function gnutls_priority_init in gnutls manual, common strings are: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** default value: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** description: pass:none[local cache directory for scripts; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** description: pass:none[local cache directory for scripts (path is evaluated, see function string_eval_path_home in plugin API reference)]
** type: string
** values: any string
-** default value: `+"%h/script"+`
+** default value: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** description: pass:none[URL for file with list of scripts]
diff --git a/doc/fr/includes/autogen_api_infos.fr.adoc b/doc/fr/includes/autogen_api_infos.fr.adoc
index 8259e5caf..ba5bc127d 100644
--- a/doc/fr/includes/autogen_api_infos.fr.adoc
+++ b/doc/fr/includes/autogen_api_infos.fr.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | version de WeeChat (sous forme de nombre) | -
+| weechat | weechat_cache_dir | répertoire du cache WeeChat | -
+
+| weechat | weechat_config_dir | répertoire de la configuration WeeChat | -
+
| weechat | weechat_daemon | 1 si WeeChat tourne en mode démon (sans interface, en tâche de fond) | -
-| weechat | weechat_dir | répertoire de WeeChat | -
+| weechat | weechat_data_dir | répertoire des données WeeChat | -
+
+| weechat | weechat_dir | répertoire de WeeChat (*obsolète depuis la version 3.2, remplacé par "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" et "weechat_runtime_dir") | -
| weechat | weechat_headless | 1 si WeeChat tourne sans interface | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | répertoire "locale" de WeeChat | -
+| weechat | weechat_runtime_dir | répertoire de "runtime" WeeChat | -
+
| weechat | weechat_sharedir | répertoire "share" de WeeChat | -
| weechat | weechat_site | site WeeChat | -
diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc
index 5ebc45cd4..0f79ed582 100644
--- a/doc/fr/includes/autogen_user_commands.fr.adoc
+++ b/doc/fr/includes/autogen_user_commands.fr.adoc
@@ -1981,7 +1981,7 @@ Avec l'option "-quit", le processus est légèrement différent :
5. quitter WeeChat
Et plus tard vous pouvez restaurer la session avec la commande : weechat --upgrade
IMPORTANT : vous devez restaurer la session avec exactement la même configuration (fichiers *.conf).
-Il est également possible de restaurer la session WeeChat sur une autre machine si vous y copiez le contenu du répertoire "~/.weechat".
+Il est également possible de restaurer la session WeeChat sur une autre machine si vous y copiez le contenu des répertoires personnels de WeeChat (voir /debug dirs).
----
[[command_weechat_uptime]]
@@ -2272,14 +2272,14 @@ disable : désactiver le tube FIFO
toggle : activer/désactiver le tube FIFO
Le tube FIFO est utilisé comme contrôle à distance de WeeChat : vous pouvez envoyer des commandes ou du texte au tube FIFO depuis votre shell.
-Par défaut le tube FIFO est dans ~/.weechat/weechat_fifo
+Par défaut le tube FIFO se nomme ~/.weechat/weechat_fifo_xxx (où xxx est l'id du processus WeeChat) et situé dans le répertoire "runtime" de WeeChat (voir /debug dirs).
Le format attendu est l'un des suivants :
plugin.buffer *texte ou commande ici
*texte ou commande ici
Par exemple pour changer votre pseudo sur freenode :
- echo 'irc.server.freenode */nick autrepseudo' >~/.weechat/weechat_fifo
+ echo 'irc.server.freenode */nick autrepseudo' >~/.weechat/weechat_fifo_12345
Merci de lire le guide utilisateur pour plus d'information et des exemples.
@@ -2716,7 +2716,7 @@ Sans paramètre, cette commande liste les scripts chargés.
stop : fermer le socket serveur (les clients restent connectés)
nom : nom du relai (voir le format ci-dessous)
port : port utilisé pour le relai
- chemin : chemin utilisé pour le relai (pour un socket de domaine UNIX seulement) ; "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat"), le contenu est évalué (voir /help eval)
+ chemin : chemin utilisé pour le relai (pour un socket de domaine UNIX seulement) ; le chemin est évalué (voir la fonction string_eval_path_home dans la référence API extension)
raw : ouvrir le tampon avec les données brutes Relay
sslcertkey : définir le certificat/clé SSL en utilisant le chemin de l'option relay.network.ssl_cert_key
@@ -2752,7 +2752,7 @@ Exemples :
protocole weechat avec SSL, en utilisant IPv4 + IPv6 :
/relay add ipv4.ipv6.ssl.weechat 9001
protocole weechat avec un socket de domaine UNIX :
- /relay add unix.weechat %h/relay_socket
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/fr/includes/autogen_user_options.fr.adoc b/doc/fr/includes/autogen_user_options.fr.adoc
index fac0ce690..6b9dfc811 100644
--- a/doc/fr/includes/autogen_user_options.fr.adoc
+++ b/doc/fr/includes/autogen_user_options.fr.adoc
@@ -1261,7 +1261,7 @@
** valeur par défaut: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** description: pass:none[fichier contenant les autorités de certification ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")]
+** description: pass:none[fichier contenant les autorités de certification (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
** valeur par défaut: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** valeur par défaut: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** description: pass:none[chemin de recherche des extensions ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")]
+** description: pass:none[chemin de recherche des extensions (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/plugins"+`
+** valeur par défaut: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** description: pass:none[sauvegarder les fichiers de configuration lors du déchargement des extensions]
@@ -1451,10 +1451,10 @@
** valeur par défaut: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** description: pass:none[chemin pour les fichiers de log WeeChat ; "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") ; les caractères de formatage de date sont autorisés (voir man strftime) (note : le contenu est évalué, voir /help eval)]
+** description: pass:none[chemin pour les fichiers de log WeeChat ; les caractères de formatage de date sont autorisés (voir man strftime) (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/logs/"+`
+** valeur par défaut: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** description: pass:none[caractère de remplacement dans le nom de fichier construit avec le masque (comme le délimiteur de répertoire)]
@@ -1827,10 +1827,10 @@
** valeur par défaut: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** description: pass:none[chemin pour le tube FIFO ; "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") ; le PID de WeeChat peut être utilisé dans le chemin avec ${info:pid} (note : le contenu est évalué, voir /help eval)]
+** description: pass:none[chemin pour le tube FIFO ; le PID de WeeChat peut être utilisé dans le chemin avec ${info:pid} (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/weechat_fifo"+`
+** valeur par défaut: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** valeur par défaut: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** description: pass:none[chemin où écrire les fichiers reçus : "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)]
+** description: pass:none[chemin où écrire les fichiers reçus (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/xfer"+`
+** valeur par défaut: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** description: pass:none[suffixe de fichier temporaire utilisé pendant le transfert pour un fichier reçu, il est supprimé après un transfert réussi ; si chaîne vide, aucun suffixe de fichier n'est utilisé pendant le transfert]
@@ -1943,7 +1943,7 @@
** valeur par défaut: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** description: pass:none[chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par l'utilisateur) : "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)]
+** description: pass:none[chemin où lire les fichiers à envoyer (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
** valeur par défaut: `+"~"+`
@@ -2743,7 +2743,7 @@
** valeur par défaut: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** description: pass:none[fichier avec la clé privée ECC pour le mécanisme "ecdsa-nist256p-challenge" ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")]
+** description: pass:none[fichier avec la clé privée ECC pour le mécanisme "ecdsa-nist256p-challenge" (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
** valeur par défaut: `+""+`
@@ -2785,7 +2785,7 @@
** valeur par défaut: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** description: pass:none[fichier de certificat SSL utilisé pour identifier automatiquement votre pseudo ("%h" sera remplacé par le répertoire de base WeeChat, par défaut : "~/.weechat")]
+** description: pass:none[fichier de certificat SSL utilisé pour identifier automatiquement votre pseudo (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
** valeur par défaut: `+""+`
@@ -3009,10 +3009,10 @@
** valeur par défaut: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** description: pass:none[fichier avec le certificat et la clé privée SSL (pour servir les clients avec SSL)]
+** description: pass:none[fichier avec le certificat et la clé privée SSL (pour servir les clients avec SSL) (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/ssl/relay.pem"+`
+** valeur par défaut: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** description: pass:none[chaîne avec les priorités pour gnutls (pour la syntaxe, voir la documentation de la fonction gnutls_priority_init du manuel gnutls, les chaînes courantes sont : "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** valeur par défaut: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** description: pass:none[répertoire du cache local pour les scripts ; "%h" au début de la chaîne est remplacé par le répertoire de base WeeChat (par défaut : "~/.weechat") (note : le contenu est évalué, voir /help eval)]
+** description: pass:none[répertoire du cache local pour les scripts (le chemin est évalué, voir la fonction string_eval_path_home dans la référence API extension)]
** type: chaîne
** valeurs: toute chaîne
-** valeur par défaut: `+"%h/script"+`
+** valeur par défaut: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** description: pass:none[URL pour le fichier avec la liste des scripts]
diff --git a/doc/it/includes/autogen_api_infos.it.adoc b/doc/it/includes/autogen_api_infos.it.adoc
index df31047d4..d7b2836c6 100644
--- a/doc/it/includes/autogen_api_infos.it.adoc
+++ b/doc/it/includes/autogen_api_infos.it.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | versione di WeeChat (come numero) | -
+| weechat | weechat_cache_dir | WeeChat cache directory | -
+
+| weechat | weechat_config_dir | WeeChat config directory | -
+
| weechat | weechat_daemon | 1 if WeeChat is running in daemon mode (headless, in background) | -
-| weechat | weechat_dir | directory WeeChat | -
+| weechat | weechat_data_dir | WeeChat data directory | -
+
+| weechat | weechat_dir | WeeChat directory (*deprecated* since version 3.2, replaced by "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" and "weechat_runtime_dir") | -
| weechat | weechat_headless | 1 if WeeChat is running headless | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | directory "locale" di WeeChat | -
+| weechat | weechat_runtime_dir | WeeChat runtime directory | -
+
| weechat | weechat_sharedir | directory "share" di WeeChat | -
| weechat | weechat_site | sito di WeeChat | -
diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc
index c75beaaec..37523bdc6 100644
--- a/doc/it/includes/autogen_user_commands.it.adoc
+++ b/doc/it/includes/autogen_user_commands.it.adoc
@@ -1981,7 +1981,7 @@ With option "-quit", the process is slightly different:
5. quit WeeChat
Then later you can restore session with command: weechat --upgrade
IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
-It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat".
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
----
[[command_weechat_uptime]]
@@ -2272,14 +2272,14 @@ disable: disable FIFO pipe
toggle: toggle FIFO pipe
FIFO pipe is used as remote control of WeeChat: you can send commands or text to the FIFO pipe from your shell.
-By default the FIFO pipe is in ~/.weechat/weechat_fifo
+By default the FIFO pipe is called weechat_fifo_xxx (where xxx is the WeeChat process id) and located in the WeeChat runtime directory (see /debug dirs).
The expected format is one of:
plugin.buffer *text or command here
*text or command here
For example to change your freenode nick:
- echo 'irc.server.freenode */nick newnick' >~/.weechat/weechat_fifo
+ echo 'irc.server.freenode */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
Please read the user's guide for more info and examples.
@@ -2716,7 +2716,7 @@ Without argument, this command lists all loaded scripts.
stop: close the server socket (clients remain connected)
name: relay name (see format below)
port: port used for relay
- path: path used for relay (for UNIX domain socket only); "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default), content is evaluated (see /help eval)
+ path: path used for relay (for UNIX domain socket only); path is evaluated (see function string_eval_path_home in plugin API reference)
raw: open buffer with raw Relay data
sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
@@ -2752,7 +2752,7 @@ Examples:
weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
weechat protocol over UNIX domain socket:
- /relay add unix.weechat %h/relay_socket
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/it/includes/autogen_user_options.it.adoc b/doc/it/includes/autogen_user_options.it.adoc
index 1835d498d..36b361df2 100644
--- a/doc/it/includes/autogen_user_options.it.adoc
+++ b/doc/it/includes/autogen_user_options.it.adoc
@@ -1261,7 +1261,7 @@
** valore predefinito: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** descrizione: pass:none[file contenente le autorità certificative ("%h" sarà sostituito dalla home di WeeChat, predefinita: "~/.weechat)]
+** descrizione: pass:none[file containing the certificate authorities (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
** valore predefinito: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** valore predefinito: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** descrizione: pass:none[path per la ricerca dei plugin ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)]
+** descrizione: pass:none[path for searching plugins (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/plugins"+`
+** valore predefinito: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** descrizione: pass:none[salva i file di configurazione allo scaricamento dei plugin]
@@ -1451,10 +1451,10 @@
** valore predefinito: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** descrizione: pass:none[path for WeeChat log files; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default); date specifiers are permitted (see man strftime) (note: content is evaluated, see /help eval)]
+** descrizione: pass:none[path for WeeChat log files; date specifiers are permitted (see man strftime) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/logs/"+`
+** valore predefinito: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** descrizione: pass:none[carattere di sostituzione per i caratteri speciali nei nomi dei file salvati con la mask (come il delimitatore di directory)]
@@ -1827,10 +1827,10 @@
** valore predefinito: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** descrizione: pass:none[path for FIFO file; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default); WeeChat PID can be used in path with ${info:pid} (note: content is evaluated, see /help eval)]
+** descrizione: pass:none[path for FIFO file; WeeChat PID can be used in path with ${info:pid} (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/weechat_fifo"+`
+** valore predefinito: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** valore predefinito: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** descrizione: pass:none[path for writing incoming files: "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** descrizione: pass:none[path for writing incoming files (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/xfer"+`
+** valore predefinito: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** descrizione: pass:none[temporary filename suffix used during the transfer for a file received, it is removed after successful transfer; if empty string, no filename suffix is used during the transfer]
@@ -1943,7 +1943,7 @@
** valore predefinito: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** descrizione: pass:none[path for reading files when sending (when no path is specified by user): "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** descrizione: pass:none[path for reading files when sending (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
** valore predefinito: `+"~"+`
@@ -2743,7 +2743,7 @@
** valore predefinito: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** descrizione: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" ("%h" will be replaced by WeeChat home, "~/.weechat" by default)]
+** descrizione: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
** valore predefinito: `+""+`
@@ -2785,7 +2785,7 @@
** valore predefinito: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** descrizione: pass:none[file del certificato SSL usato per identificare automaticamente il proprio nick ("%h" sarà sostituito dalla home di WeeChat, "~/.weechat come predefinita)]
+** descrizione: pass:none[SSL certificate file used to automatically identify your nick (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
** valore predefinito: `+""+`
@@ -3009,10 +3009,10 @@
** valore predefinito: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** descrizione: pass:none[file con il certificato SSL e la chiave privata (per servire i client con SSL)]
+** descrizione: pass:none[file with SSL certificate and private key (for serving clients with SSL) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/ssl/relay.pem"+`
+** valore predefinito: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** descrizione: pass:none[stringa con le priorità per gnutls (per la sintassi, consultare la documentazione per la funzione gnutls_priority_init nel manuale di gnutls, stringhe comuni sono: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** valore predefinito: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** descrizione: pass:none[local cache directory for scripts; "%h" at beginning of string is replaced by WeeChat home ("~/.weechat" by default) (note: content is evaluated, see /help eval)]
+** descrizione: pass:none[local cache directory for scripts (path is evaluated, see function string_eval_path_home in plugin API reference)]
** tipo: stringa
** valori: qualsiasi stringa
-** valore predefinito: `+"%h/script"+`
+** valore predefinito: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** descrizione: pass:none[URL for file with list of scripts]
diff --git a/doc/ja/includes/autogen_api_infos.ja.adoc b/doc/ja/includes/autogen_api_infos.ja.adoc
index b1f3f65dd..f328cdcb5 100644
--- a/doc/ja/includes/autogen_api_infos.ja.adoc
+++ b/doc/ja/includes/autogen_api_infos.ja.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | WeeChat のバージョン (数字) | -
+| weechat | weechat_cache_dir | WeeChat cache directory | -
+
+| weechat | weechat_config_dir | WeeChat config directory | -
+
| weechat | weechat_daemon | 1 if WeeChat is running in daemon mode (headless, in background) | -
-| weechat | weechat_dir | WeeChat ディレクトリ | -
+| weechat | weechat_data_dir | WeeChat data directory | -
+
+| weechat | weechat_dir | WeeChat directory (*deprecated* since version 3.2, replaced by "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" and "weechat_runtime_dir") | -
| weechat | weechat_headless | 1 if WeeChat is running headless | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | WeeChat "locale" ディレクトリ | -
+| weechat | weechat_runtime_dir | WeeChat runtime directory | -
+
| weechat | weechat_sharedir | WeeChat "share" ディレクトリ | -
| weechat | weechat_site | WeeChat サイト | -
diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc
index 0ace26e69..7a9bded40 100644
--- a/doc/ja/includes/autogen_user_commands.ja.adoc
+++ b/doc/ja/includes/autogen_user_commands.ja.adoc
@@ -1958,30 +1958,30 @@ option: オプションの名前
----
/upgrade [-yes] [<path_to_binary>|-quit]
- -yes: "weechat.look.confirm_upgrade" オプションが有効化されていた場合、このオプションは必須です。
-path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ)
- -dummy: 何もしない (補完された "-quit" オプションを不用意に使わないためのオプション)
- -quit: *すべての* 接続を閉じ、セッションを保存して WeeChat を終了。遅延復帰 (詳しくは後述) が可能になります。
+ -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+ -dummy: do nothing (option used to prevent accidental completion with "-quit")
+ -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
-このコマンドは起動中の WeeChat セッションのアップグレードとリロードを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
-注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。
+Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
-アップグレードは 4 つの手順を踏みます:
- 1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存
- 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます)
- 3. WeeChat 設定を保存 (weechat.conf)
- 4. 新しい WeeChat バイナリを実行してセッションをリロード。
+Upgrade process has 4 steps:
+ 1. save session into files for core and plugins (buffers, history, ..)
+ 2. unload all plugins (configuration files (*.conf) are written on disk)
+ 3. save WeeChat configuration (weechat.conf)
+ 4. execute new WeeChat binary and reload session.
-オプション "-quit" を使うと、上の挙動が少し変わります:
- 1. *すべての* 接続を閉じる (irc、xfer、relay、...)
- 2. すべてのセッションをファイルに保存 (*.upgrade)
- 3. すべてのプラグインをアンロード
- 4. WeeChat 設定を保存
- 5. WeeChat を終了
-この後、セッションを回復させるには weechat --upgrade を使ってください。
-重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてください。
-"~/.weechat" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッションを回復することも可能です。
+With option "-quit", the process is slightly different:
+ 1. close *ALL* connections (irc, xfer, relay, ...)
+ 2. save session into files (*.upgrade)
+ 3. unload all plugins
+ 4. save WeeChat configuration
+ 5. quit WeeChat
+Then later you can restore session with command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
----
[[command_weechat_uptime]]
@@ -2267,23 +2267,23 @@ Examples:
----
/fifo enable|disable|toggle
- enable: FIFO パイプを有効化します
-disable: FIFO パイプを無効化します
- toggle: FIFO パイプの有効無効を切り替えます
+ enable: enable FIFO pipe
+disable: disable FIFO pipe
+ toggle: toggle FIFO pipe
-FIFO パイプは WeeChat をリモート操作する際に使われます: FIFO パイプを通じてシェルからコマンドやテキストを送信できます。
-デフォルトの場合 FIFO パイプは ~/.weechat/weechat_fifo です。
+FIFO pipe is used as remote control of WeeChat: you can send commands or text to the FIFO pipe from your shell.
+By default the FIFO pipe is called weechat_fifo_xxx (where xxx is the WeeChat process id) and located in the WeeChat runtime directory (see /debug dirs).
-書式は次のうちのどれか 1 つを使ってください:
- plugin.buffer *テキストまたはコマンド
- *テキストまたはコマンド
+The expected format is one of:
+ plugin.buffer *text or command here
+ *text or command here
-freenode のニックネームを変更する例:
- echo 'irc.server.freenode */nick newnick' >~/.weechat/weechat_fifo
+For example to change your freenode nick:
+ echo 'irc.server.freenode */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
-詳しい情報と例はユーザーズガイドを参照してください。
+Please read the user's guide for more info and examples.
-例:
+Examples:
/fifo toggle
----
// end::fifo_commands[]
@@ -2706,53 +2706,53 @@ filename: ロードするスクリプト (ファイル)
raw
sslcertkey
- list: リレーするクライアントをリストアップ (アクティブなもののみ)
- listfull: リレーするクライアントをリストアップ (詳細、全てのリレー)
- listrelay: リレーをリストアップ (名前とポート番号)
- add: リレーを追加 (ポート/パスで接続を待ち受ける)
- del: リレーを削除 (クライアントとの接続は保持)
- start: ポートリッスンを開始する
- restart: サーバソケットを閉じて同じポートで接続を待つ (クライアントとの接続は保持)
- stop: サーバソケットを閉じる (クライアントとの接続は保持)
- name: リレー名 (以下の書式を参照してください)
- port: リレーが使うポート
- path: リレーが使うパス (UNIX ドメインソケット); 文字列先頭の "%h" は WeeChat ホーム (デフォルトは "~/.weechat") で置き換えられ、内容は評価されます (/help eval を参照してください)
- raw: 生リレーデータを表示するバッファを開く
- sslcertkey: オプション relay.network.ssl_cert_key のパスを使って SSL 証明書/鍵を指定
-
-リレー名の書式: [ipv4.][ipv6.][ssl.]<protocol.name> または unix.[ssl.]<protocol.name>
- ipv4: IPv4 を強制的に利用
- ipv6: IPv6 を強制的に利用
- ssl: SSL を有効化
- unix: UNIX ドメインソケットを利用
-protocol.name: リレーするプロトコルと名前:
- - "irc" プロトコル: name は共有するサーバ名 (任意指定、指定しない場合、サーバ名は "PASS" コマンドでクライアントが送信するものと同じでなければいけません、"PASS" コマンドの書式は "PASS server:password")
- - "weechat" プロトコル (name は使われません)
-
-"irc" プロトコルを指定した場合、どんな IRC クライアント (WeeChat 自身を含めて) でもポートに接続することができます。
-"weechat" プロトコルを指定した場合、リモートインターフェースを使ってポートに接続することができます、参照: https://weechat.org/about/interfaces
-
-引数無しの場合、リレークライアントのリストを含むバッファを開く
+ list: list relay clients (only active relays)
+ listfull: list relay clients (verbose, all relays)
+ listrelay: list relays (name and port)
+ add: add a relay (listen on a port/path)
+ del: remove a relay (clients remain connected)
+ start: listen on port
+ restart: close the server socket and listen again on port (clients remain connected)
+ stop: close the server socket (clients remain connected)
+ name: relay name (see format below)
+ port: port used for relay
+ path: path used for relay (for UNIX domain socket only); path is evaluated (see function string_eval_path_home in plugin API reference)
+ raw: open buffer with raw Relay data
+ sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
+
+Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name> or unix.[ssl.]<protocol.name>
+ ipv4: force use of IPv4
+ ipv6: force use of IPv6
+ ssl: enable SSL
+ unix: use UNIX domain socket
+protocol.name: protocol and name to relay:
+ - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
+ - protocol "weechat" (name is not used)
+
+The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
+The "weechat" protocol allows a remote interface to connect on the port, see the list here: https://weechat.org/about/interfaces
+
+Without argument, this command opens buffer with list of relay clients.
-例:
- サーバ "freenode" に対する irc プロキシを設定:
+Examples:
+ irc proxy, for server "freenode":
/relay add irc.freenode 8000
- サーバ "freenode" に対する SSL を有効化した irc プロキシを設定:
+ irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
- SSL を有効化してすべてのサーバに対する irc プロキシを設定 (クライアントがサーバを選ぶ):
+ irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
- weechat プロトコル:
+ weechat protocol:
/relay add weechat 9000
- SSL を有効化した weechat プロトコル:
+ weechat protocol with SSL:
/relay add ssl.weechat 9001
- SSL を有効にした weechat プロトコル、IPv4 だけを利用:
+ weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
- SSL を有効にした weechat プロトコル、IPv6 だけを利用:
+ weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
- SSL を有効にした weechat プロトコル、IPv4 と IPv6 を利用:
+ weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
- UNIX ドメインソケットを介した weechat プロトコル:
- /relay add unix.weechat %h/relay_socket
+ weechat protocol over UNIX domain socket:
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/ja/includes/autogen_user_options.ja.adoc b/doc/ja/includes/autogen_user_options.ja.adoc
index 9d0e3d54b..5821c5ab0 100644
--- a/doc/ja/includes/autogen_user_options.ja.adoc
+++ b/doc/ja/includes/autogen_user_options.ja.adoc
@@ -1261,7 +1261,7 @@
** デフォルト値: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** 説明: pass:none[認証局を含むファイル ("%h" は WeeChat ホームに置換されます、デフォルトでは "~/.weechat" です)]
+** 説明: pass:none[file containing the certificate authorities (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
** デフォルト値: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** デフォルト値: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** 説明: pass:none[プラグイン検索パス ("%h" は WeeChat ホームに置換されます、デフォルトでは "~/.weechat" です)]
+** 説明: pass:none[path for searching plugins (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/plugins"+`
+** デフォルト値: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** 説明: pass:none[プラグインをアンロードする際に設定ファイルをセーブ]
@@ -1451,10 +1451,10 @@
** デフォルト値: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** 説明: pass:none[WeeChat ログファイルのパス; 文字列最初の "%h" は WeeChat ホームに置換 (デフォルトでは "~/.weechat" に置換); 日付指定子を使える (strftime の man を参照してください) (注意: 内容は評価されます、/help eval 参照)]
+** 説明: pass:none[path for WeeChat log files; date specifiers are permitted (see man strftime) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/logs/"+`
+** デフォルト値: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** 説明: pass:none[マスクと一緒に使われたときのファイル名に含まれる特殊文字に対応する置換文字 (ディレクトリ区切りのようなもの)]
@@ -1827,10 +1827,10 @@
** デフォルト値: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** 説明: pass:none[FIFO ファイルのパス; 文字列最初の "%h" は WeeChat ホーム に置換されます (デフォルトでは "~/.weechat" に置換されます); ${info:pid} を使えば WeeChat の PID を設定することも可能です (注意: 内容は評価されます、/help eval 参照)]
+** 説明: pass:none[path for FIFO file; WeeChat PID can be used in path with ${info:pid} (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/weechat_fifo"+`
+** デフォルト値: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** デフォルト値: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** 説明: pass:none[受信ファイルのパス: 文字列最初の "%h" は WeeChat ホーム に置換されます (デフォルトでは "~/.weechat" に置換されます) (注意: 内容は評価されます、/help eval 参照)]
+** 説明: pass:none[path for writing incoming files (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/xfer"+`
+** デフォルト値: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** 説明: pass:none[temporary filename suffix used during the transfer for a file received, it is removed after successful transfer; if empty string, no filename suffix is used during the transfer]
@@ -1943,7 +1943,7 @@
** デフォルト値: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** 説明: pass:none[送信時に読み込むファイルのパス (ユーザがパスを指定しなかった場合に使われます): 文字列最初の "%h" は WeeChat ホームに置換されます (デフォルトでは "~/.weechat" に置換されます) (注意: 内容は評価されます、/help eval 参照)]
+** 説明: pass:none[path for reading files when sending (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
** デフォルト値: `+"~"+`
@@ -2743,7 +2743,7 @@
** デフォルト値: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** 説明: pass:none["ecdsa-nist256p-challenge" メカニズム用の ECC 秘密鍵を含むファイル ("%h" は WeeChat ホームに置換されます、デフォルトでは "~/.weechat" です)]
+** 説明: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
** デフォルト値: `+""+`
@@ -2785,7 +2785,7 @@
** デフォルト値: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** 説明: pass:none[自動的にニックネームの身元確認を行うために使われる SSL 証明書ファイル ("%h" は WeeChat ホームで置換、デフォルトは "~/.weechat" です)]
+** 説明: pass:none[SSL certificate file used to automatically identify your nick (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
** デフォルト値: `+""+`
@@ -3009,10 +3009,10 @@
** デフォルト値: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** 説明: pass:none[SSL 証明書と秘密鍵のファイル (SSL 接続を利用するクライアント用)]
+** 説明: pass:none[file with SSL certificate and private key (for serving clients with SSL) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/ssl/relay.pem"+`
+** デフォルト値: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** 説明: pass:none[gnutls の優先度を示した文字列 (構文は、gnutls マニュアルの gnutls_priority_init 関数のドキュメントを参照してください、通例: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** デフォルト値: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** 説明: pass:none[スクリプト用のローカルキャッシュディレクトリ; 文字列最初の "%h" は WeeChat ホーム に置換されます (デフォルトでは "~/.weechat" に置換されます) (注意: 内容は評価されます、/help eval 参照)]
+** 説明: pass:none[local cache directory for scripts (path is evaluated, see function string_eval_path_home in plugin API reference)]
** タイプ: 文字列
** 値: 未制約文字列
-** デフォルト値: `+"%h/script"+`
+** デフォルト値: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** 説明: pass:none[スクリプトのリストを含むファイルの URL]
diff --git a/doc/pl/includes/autogen_api_infos.pl.adoc b/doc/pl/includes/autogen_api_infos.pl.adoc
index 1c01ec923..9b39fd77a 100644
--- a/doc/pl/includes/autogen_api_infos.pl.adoc
+++ b/doc/pl/includes/autogen_api_infos.pl.adoc
@@ -134,9 +134,15 @@
| weechat | version_number | Wersja WeeChat (jako liczba) | -
+| weechat | weechat_cache_dir | WeeChat cache directory | -
+
+| weechat | weechat_config_dir | WeeChat config directory | -
+
| weechat | weechat_daemon | 1 if WeeChat is running in daemon mode (headless, in background) | -
-| weechat | weechat_dir | Katalog WeeChat | -
+| weechat | weechat_data_dir | WeeChat data directory | -
+
+| weechat | weechat_dir | WeeChat directory (*deprecated* since version 3.2, replaced by "weechat_config_dir", "weechat_data_dir", "weechat_cache_dir" and "weechat_runtime_dir") | -
| weechat | weechat_headless | 1 jeśli WeeChat działa w trybie bez interfejsu | -
@@ -144,6 +150,8 @@
| weechat | weechat_localedir | Katalog "locale" WeeChata | -
+| weechat | weechat_runtime_dir | WeeChat runtime directory | -
+
| weechat | weechat_sharedir | Katalog "share" WeeChata | -
| weechat | weechat_site | Strona WeeChat | -
diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc
index 537c7c70e..41b26dba2 100644
--- a/doc/pl/includes/autogen_user_commands.pl.adoc
+++ b/doc/pl/includes/autogen_user_commands.pl.adoc
@@ -1957,30 +1957,30 @@ Przykłady:
----
/upgrade [-yes] [<ścieżka_do_binarki>|-quit]
- -yes: wymagane, jeśli "weechat.look.confirm_upgrade" jest włączona
-ścieżka_do_binarki: ścieżka do pliku binarnego WeeChat (domyślnie jest to obecny plik)
- -dummy: nic nie rób (opcja użyta w celu zapobiegnięcia przypadkowego dopełnienia za pomocą"-quit")
- -quit: zamyka *WSZYSTKIE* połączenia, zapisuje sesję i wyłącza WeeChat, umożliwia to późniejsze przywrócenie (zobacz niżej)
+ -yes: required if option "weechat.look.confirm_upgrade" is enabled
+path_to_binary: path to WeeChat binary (default is current binary)
+ -dummy: do nothing (option used to prevent accidental completion with "-quit")
+ -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below)
-Ta komenda uaktualnia i przeładowuje działającą sesję WeeChat. Nowy plik binarny WeeChat powinien zostać skompilowany lub zainstalowany za pomocą managera pakietów przed uruchomieniem tej komendy.
+This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command.
-Uwaga: połączenia SSL są przerywane podczas uaktualniania, ponieważ przeładowanie sesji SSL nie jest obecnie możliwe za pomocą GnuTLS. Po uaktualnieniu nastąpi ponowne ich połączenie.
+Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade.
-Proces uaktualnienia składa się z 4 kroków:
- 1. zapisania sesji do plików dla rdzenia i wtyczek (bufory, historia, ..)
- 2. wyładowanie wszystkich wtyczek (zapisanie plików konfiguracyjnych *.conf)
- 3. zapisanie konfiguracji WeeChat (weechat.conf)
- 4. uruchomienie nowego pliku binarnego WeeChat i przeładowanie sesji.
+Upgrade process has 4 steps:
+ 1. save session into files for core and plugins (buffers, history, ..)
+ 2. unload all plugins (configuration files (*.conf) are written on disk)
+ 3. save WeeChat configuration (weechat.conf)
+ 4. execute new WeeChat binary and reload session.
-Z opcją "-quit", proces przebiega inaczej:
- 1. zamknięcie *WSZYSTKICH* połączeń (irc, xfer, relay, ...)
- 2. zapisanie sesji do pliku (*.upgrade)
- 3. wyładowanie wszystkich wtyczek
- 4. zapisanie konfiguracji WeeChat
- 5. wyłączenie WeeChat
-Następnie można przywrócić sesję za pomocą komendy: weechat --upgrade
-WAŻNE: należy przywracać sesję z identyczną konfiguracją (pliki *.conf).
-Jest możliwe przywrócenie sesji WeeChat na innej maszynie, jeśli skopiujemy zawartość katalogu "~/.weechat".
+With option "-quit", the process is slightly different:
+ 1. close *ALL* connections (irc, xfer, relay, ...)
+ 2. save session into files (*.upgrade)
+ 3. unload all plugins
+ 4. save WeeChat configuration
+ 5. quit WeeChat
+Then later you can restore session with command: weechat --upgrade
+IMPORTANT: you must restore the session with exactly same configuration (files *.conf).
+It is possible to restore WeeChat session on another machine if you copy the content of WeeChat home directories (see /debug dirs).
----
[[command_weechat_uptime]]
@@ -2266,23 +2266,23 @@ Przykłady:
----
/fifo enable|disable|toggle
- enable: włącza strumień FIFO
-disable: wyłącza strumień FIFO
- toggle: przełącza stan strumienia FIFO
+ enable: enable FIFO pipe
+disable: disable FIFO pipe
+ toggle: toggle FIFO pipe
-Strumień FIFO jest używany do zdalnej kontroli nad WeeChat: możesz wysyłać komendy albo tekst do strumienia z konsoli.
-Domyślnie strumień FIFO jest tworzony w ~/.weechat/weechat_fifo
+FIFO pipe is used as remote control of WeeChat: you can send commands or text to the FIFO pipe from your shell.
+By default the FIFO pipe is called weechat_fifo_xxx (where xxx is the WeeChat process id) and located in the WeeChat runtime directory (see /debug dirs).
-Spodziewane formaty:
- plugin.buffer *tekst albo komenda
- *tekst albo komenda
+The expected format is one of:
+ plugin.buffer *text or command here
+ *text or command here
-Na przykład zmiana nicka w sieci freenode:
- echo 'irc.server.freenode */nick nowynick' >~/.weechat/weechat_fifo
+For example to change your freenode nick:
+ echo 'irc.server.freenode */nick newnick' >/run/user/1000/weechat/weechat_fifo_12345
-Więcej informacji i przykładów można znaleźć w poradniku użytkownika.
+Please read the user's guide for more info and examples.
-Przykłady:
+Examples:
/fifo toggle
----
// end::fifo_commands[]
@@ -2705,53 +2705,53 @@ Bez argumentów ta komenda wyświetli wszystkie załadowane wtyczki.
raw
sslcertkey
- list: wyświetla klienty pośrednika (tylko aktywne)
- listfull: wyświetla klienty pośrednika (wszystkie)
- listrelay: wyświetla pośredników (nazwa i port)
- add: dodaje relay (nasłuchuje na porcie)
- del: usuwa relay (klienty zostają połączone)
- start: nasłuchuje na porcie
- restart: zamyka porta serwera i otwiera go ponownie nasłuchując na nim (klienty zostają połączone)
- stop: zamyka gniazdo serwera (klienty zostają połączone)
- nazwa: nazwa pośrednika (format poniżej)
- port: port używany przez pośrednika
- ścieżka: ścieżka używana przez pośrednika (tylko dla socketów UNIXowych); "%h" na początku ciągu jest zastępowane katalogiem domowym WeeChat (domyślnie "~/.weechat"), zawartość jest przetwarzana (zobacz /help eval)
- raw: otwiera bufor z nieprzetworzonymi danymi pośrednika
- sslcertkey: ustawia certyfikat SSL/hasło używając ścieżki w opcji relay.network.ssl_cert_key
-
-Nazwa pośrednika to: [ipv4.][ipv6.][ssl.]<protokół.nazwa> lub unix.[ssl.]<protokół. nazwa>
- ipv4: wymusza użycie IPv4
- ipv6: wymusza użycie IPv6
- ssl: włącza SSL
- unix: używa socketu UNIXowego
-protokół.nazwa: protokół i nazwa do przekazywania:
- - protokół "irc": nazwą jest serwer do współdzielenia (opcjonalne, jeśli nie podane, nazwa serwera musi być wysłana przez klienta w komendzie "PASS", format: "PASS serwer:hasło")
- - protokół "weechat" (nazwa nie jest używana)
-
-Protokół "irc" pozwala dowolnemu klientowi IRC (włączając w to WeeChat) połączyć się na ustawionym porcie.
-Protokół "weechat" pozwala na połączenie się zdalnym interfejsem, lista dostępna pod adresem: https://weechat.org/about/interfaces
-
-Bez argumentu komenda otwiera bufor z listą klientów.
-
-Przykłady:
- pośrednik irc dla serwera "freenode":
+ list: list relay clients (only active relays)
+ listfull: list relay clients (verbose, all relays)
+ listrelay: list relays (name and port)
+ add: add a relay (listen on a port/path)
+ del: remove a relay (clients remain connected)
+ start: listen on port
+ restart: close the server socket and listen again on port (clients remain connected)
+ stop: close the server socket (clients remain connected)
+ name: relay name (see format below)
+ port: port used for relay
+ path: path used for relay (for UNIX domain socket only); path is evaluated (see function string_eval_path_home in plugin API reference)
+ raw: open buffer with raw Relay data
+ sslcertkey: set SSL certificate/key using path in option relay.network.ssl_cert_key
+
+Relay name is: [ipv4.][ipv6.][ssl.]<protocol.name> or unix.[ssl.]<protocol.name>
+ ipv4: force use of IPv4
+ ipv6: force use of IPv6
+ ssl: enable SSL
+ unix: use UNIX domain socket
+protocol.name: protocol and name to relay:
+ - protocol "irc": name is the server to share (optional, if not given, the server name must be sent by client in command "PASS", with format: "PASS server:password")
+ - protocol "weechat" (name is not used)
+
+The "irc" protocol allows any IRC client (including WeeChat itself) to connect on the port.
+The "weechat" protocol allows a remote interface to connect on the port, see the list here: https://weechat.org/about/interfaces
+
+Without argument, this command opens buffer with list of relay clients.
+
+Examples:
+ irc proxy, for server "freenode":
/relay add irc.freenode 8000
- pośrednik irc dla serwera "freenode", z SSL:
+ irc proxy, for server "freenode", with SSL:
/relay add ssl.irc.freenode 8001
- pośrednik irc dla wszystkich serwerów (klient wybiera) z SSL:
+ irc proxy, for all servers (client will choose), with SSL:
/relay add ssl.irc 8002
- protokół weechat:
+ weechat protocol:
/relay add weechat 9000
- protokół weechat z SSL:
+ weechat protocol with SSL:
/relay add ssl.weechat 9001
- protokół weechat z SSL, używający tylko IPv4:
+ weechat protocol with SSL, using only IPv4:
/relay add ipv4.ssl.weechat 9001
- protokół weechat z SSL, używający tylko IPv6:
+ weechat protocol with SSL, using only IPv6:
/relay add ipv6.ssl.weechat 9001
- protokół weechat z SSL, używający IPv4 + IPv6:
+ weechat protocol with SSL, using IPv4 + IPv6:
/relay add ipv4.ipv6.ssl.weechat 9001
- protokół weechat po sockecie UNIXowym:
- /relay add unix.weechat %h/relay_socket
+ weechat protocol over UNIX domain socket:
+ /relay add unix.weechat ${weechat_runtime_dir}/relay_socket
----
// end::relay_commands[]
diff --git a/doc/pl/includes/autogen_user_options.pl.adoc b/doc/pl/includes/autogen_user_options.pl.adoc
index 1a24b2667..e9075b109 100644
--- a/doc/pl/includes/autogen_user_options.pl.adoc
+++ b/doc/pl/includes/autogen_user_options.pl.adoc
@@ -1261,7 +1261,7 @@
** domyślna wartość: `+60+`
* [[option_weechat.network.gnutls_ca_file]] *weechat.network.gnutls_ca_file*
-** opis: pass:none[plik zawierający CA ("%h" zostanie zastąpione katalogiem domowym WeeChat - domyślnie "~/.weechat")]
+** opis: pass:none[file containing the certificate authorities (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
** domyślna wartość: `+"/etc/ssl/certs/ca-certificates.crt"+`
@@ -1297,10 +1297,10 @@
** domyślna wartość: `+".so,.dll"+`
* [[option_weechat.plugin.path]] *weechat.plugin.path*
-** opis: pass:none[ścieżka wyszukiwania wtyczek ("%h" zostanie zastąpione katalogiem domowym WeeChat - domyślnie "~/.weechat")]
+** opis: pass:none[path for searching plugins (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/plugins"+`
+** domyślna wartość: `+"${weechat_data_dir}/plugins"+`
* [[option_weechat.plugin.save_config_on_unload]] *weechat.plugin.save_config_on_unload*
** opis: pass:none[zapisuj pliki konfiguracyjne przy wyładowywaniu wtyczek]
@@ -1451,10 +1451,10 @@
** domyślna wartość: `+""+`
* [[option_logger.file.path]] *logger.file.path*
-** opis: pass:none[ścieżka do plików z logami WeeChat; "%h" na początku ciągu zostanie zastąpione przez katalog domowy WeeChat (domyślnie "~/.weechat"); określenia dla daty są dozwolone (zobacz man strftime) (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
+** opis: pass:none[path for WeeChat log files; date specifiers are permitted (see man strftime) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/logs/"+`
+** domyślna wartość: `+"${weechat_data_dir}/logs"+`
* [[option_logger.file.replacement_char]] *logger.file.replacement_char*
** opis: pass:none[znak zastępczy dla znaków specjalnych w plikach stworzonych przy użyciu maski (jak separator katalogów)]
@@ -1827,10 +1827,10 @@
** domyślna wartość: `+on+`
* [[option_fifo.file.path]] *fifo.file.path*
-** opis: pass:none[ścieżka dla pliku FIFO; "%h" na początku ciągu zostanie zastąpione przez katalog domowy WeeChat (domyślnie "~/.weechat"); PID WeeChat możezostać użyty poprzez ${info:pid} (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
+** opis: pass:none[path for FIFO file; WeeChat PID can be used in path with ${info:pid} (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/weechat_fifo"+`
+** domyślna wartość: `+"${weechat_runtime_dir}/weechat_fifo_${info:pid}"+`
// end::fifo_options[]
// tag::xfer_options[]
@@ -1931,10 +1931,10 @@
** domyślna wartość: `+on+`
* [[option_xfer.file.download_path]] *xfer.file.download_path*
-** opis: pass:none[ścieżka, do której zapisywane będą pliki przychodzące; "%h" na początku ciągu zostanie zastąpione przez katalog domowy WeeChat (domyślnie "~/.weechat") (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
+** opis: pass:none[path for writing incoming files (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/xfer"+`
+** domyślna wartość: `+"${weechat_data_dir}/xfer"+`
* [[option_xfer.file.download_temporary_suffix]] *xfer.file.download_temporary_suffix*
** opis: pass:none[sufiks tymczasowego pliku użyty podczas pobierania pliku, zostanie usunięty po pomyślnym transferze; pusty ciąg oznacza, że nie zostanie użyty żaden przyrostek podczas transferu pliku]
@@ -1943,7 +1943,7 @@
** domyślna wartość: `+".part"+`
* [[option_xfer.file.upload_path]] *xfer.file.upload_path*
-** opis: pass:none[ścieżka do wysyłanych plików (jeśli nie zostanie ona podana przez użykownika); "%h" na początku ciągu zostanie zastąpione przez katalog domowy WeeChat (domyślnie "~/.weechat") (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
+** opis: pass:none[path for reading files when sending (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
** domyślna wartość: `+"~"+`
@@ -2743,7 +2743,7 @@
** domyślna wartość: `+continue+`
* [[option_irc.server_default.sasl_key]] *irc.server_default.sasl_key*
-** opis: pass:none[plik z kluczem prywatnym ECC dla mechanizmu "ecdsa-nist256p-challenge" ("%h" zostanie zastąpione katalogiem domowym WeeChat, domyślnie "~/.weechat")]
+** opis: pass:none[file with ECC private key for mechanism "ecdsa-nist256p-challenge" (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
** domyślna wartość: `+""+`
@@ -2785,7 +2785,7 @@
** domyślna wartość: `+off+`
* [[option_irc.server_default.ssl_cert]] *irc.server_default.ssl_cert*
-** opis: pass:none[Plik certyfikatu SSL używany do automatycznego uwierzytelnienia nicka ("%h" zostanie zastąpione katalogiem domowym WeeChat, domyślnie "~/.weechat")]
+** opis: pass:none[SSL certificate file used to automatically identify your nick (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
** domyślna wartość: `+""+`
@@ -3009,10 +3009,10 @@
** domyślna wartość: `+100000+`
* [[option_relay.network.ssl_cert_key]] *relay.network.ssl_cert_key*
-** opis: pass:none[plik z certyfikatem SSL i kluczem prywatnym (dla obsługi klientów poprzez SSL)]
+** opis: pass:none[file with SSL certificate and private key (for serving clients with SSL) (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/ssl/relay.pem"+`
+** domyślna wartość: `+"${weechat_config_dir}/ssl/relay.pem"+`
* [[option_relay.network.ssl_priorities]] *relay.network.ssl_priorities*
** opis: pass:none[ciąg z priorytetami dla gnutls (składnię można znaleźć w dokumentacji gnutls dla funkcji gnutls_priority_init, często używane ciągi to: "PERFORMANCE", "NORMAL", "SECURE128", "SECURE256", "EXPORT", "NONE")]
@@ -3393,10 +3393,10 @@
** domyślna wartość: `+""+`
* [[option_script.scripts.path]] *script.scripts.path*
-** opis: pass:none[lokalny katalog z cache skryptów; "%h" na początku ciągu zostanie zastąpione przez katalog domowy WeeChat (domyślnie "~/.weechat") (uwaga: zawartość jest przetwarzana, zobacz /help eval)]
+** opis: pass:none[local cache directory for scripts (path is evaluated, see function string_eval_path_home in plugin API reference)]
** typ: ciąg
** wartości: dowolny ciąg
-** domyślna wartość: `+"%h/script"+`
+** domyślna wartość: `+"${weechat_cache_dir}/script"+`
* [[option_script.scripts.url]] *script.scripts.url*
** opis: pass:none[Adres URL pliku z listą skryptów]