diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/de/autogen/user/irc_options.txt | 4 | ||||
-rw-r--r-- | doc/de/autogen/user/weechat_commands.txt | 62 | ||||
-rw-r--r-- | doc/de/weechat_user.de.txt | 19 | ||||
-rw-r--r-- | doc/en/autogen/user/irc_options.txt | 4 | ||||
-rw-r--r-- | doc/en/weechat_user.en.txt | 15 | ||||
-rw-r--r-- | doc/fr/autogen/user/irc_options.txt | 4 | ||||
-rw-r--r-- | doc/fr/weechat_user.fr.txt | 14 | ||||
-rw-r--r-- | doc/it/autogen/user/irc_options.txt | 4 | ||||
-rw-r--r-- | doc/it/weechat_user.it.txt | 17 | ||||
-rw-r--r-- | doc/ja/autogen/user/irc_options.txt | 4 | ||||
-rw-r--r-- | doc/ja/weechat_user.ja.txt | 17 |
11 files changed, 96 insertions, 68 deletions
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 6a5163b1d..7c758ce39 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -519,9 +519,9 @@ ** Werte: beliebige Zeichenkette (Standardwert: `""`) * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism* -** Beschreibung: `Verfahren welches bei einer SASL Authentifizierung angewandt werden soll: "plain" Passwort liegt in Klartext vor, "dh-blowfish" Passwort wird verschlüsselt, "external" SSL Zertifikat welches auf Client Seite vorliegt` +** Beschreibung: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for blowfish crypted password, "dh-aes" for AES crypted password, "external" for authentication using client side SSL cert` ** Typ: integer -** Werte: plain, dh-blowfish, external (Standardwert: `plain`) +** Werte: plain, dh-blowfish, dh-aes, external (Standardwert: `plain`) * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password* ** Beschreibung: `Passwort für SASL Authentifizierung` diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index b149b0cbd..069ae11e6 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -207,40 +207,40 @@ infolists: zeigt Information über die Infolists an /eval [-n] <expression> [-n] <expression1> <operator> <expression2> - -n: display result without sending it to buffer (debug mode) -expression: expression to evaluate, variables with format ${variable} are replaced (see below) - operator: a logical or comparison operator: - - logical operators: - && boolean "and" - || boolean "or" - - comparison operators: - == equal - != not equal - <= less or equal - < less - >= greater or equal - > greater - =~ is matching regex - !~ is NOT matching regex - -An expression is considered as "true" if it is not NULL, not empty, and different from "0". -The comparison is made using integers if the two expressions are valid integers. -To force a string comparison, add double quotes around each expression, for example: + -n: zeigt das Ergebnis an, ohne dieses in den Buffer zu schreiben (debug Modus) +expression: Ausdruck welcher verarbeitet werden soll. Variablen im Format ${variable} werden ersetzt (siehe unten) + operator: ein logischer oder vergleichender Operand: + - logische Operanden: + && boolean "und" + || boolean "oder" + - vergleichende Operanden: + == gleich + != ungleich + <= kleiner oder gleich + < kleiner + >= größer oder gleich + > größer + =~ stimmt mit regulärem Ausdruck überein + !~ stimmt NICHT mit regulärem Ausdruck überein + +Ein Ausdruck gilt als "wahr", sofern das Ergebnis nicht NULL, nicht leer und von "0" abweichend ist. +Der Vergleich findet zwischen zwei Integer statt, sofern die beiden Ausdrücke gültige Integer-Werte sind. +Um einen Vergleich zwischen zwei Zeichenketten zu erzwingen, müssen die Ausdrücke in Anführungszeichen gesetzt werden, zum Beispiel: 50 > 100 ==> 0 "50" > "100" ==> 1 -Some variables are replaced in expression, using the format ${variable}, variable can be, by order of priority : - 1. the name of an option (file.section.option) - 2. the name of a local variable in buffer - 3. a hdata name/variable (the value is automatically converted to string), by default "window" and "buffer" point to current window/buffer. -Format for hdata can be one of following: - hdata.var1.var2...: start with a hdata (pointer must be known), and ask variables one after one (other hdata can be followed) - hdata[list].var1.var2...: start with a hdata using a list, for example: - ${buffer[gui_buffers].full_name}: full name of first buffer in linked list of buffers - ${plugin[weechat_plugins].name}: name of first plugin in linked list of plugins -For name of hdata and variables, please look at "Plugin API reference", function "weechat_hdata_get". - -Examples: +Einige Variablen werden im Ausdruck, mittels der Formatierung ${Variable}, ersetzt. Mögliche Variablen sind, nach Reihenfolge ihrer Priorität: + 1. der Name einer Option (file.section.option) + 2. der Name der lokalen Variablen für Buffer + 3. ein hdata Name/Variable (der Wert wird automatisch als Zeichenkette konvertiert), Standardmäßig wird für "window" und "buffer" das aktuelle Fenster/Buffer verwendet. +Das Format für hdata: + hdata.var1.var2...: startet mit hdata (der Pointer muss bekannt sein) und fragt eine Variable nach der anderen ab (weitere hdata können folgen) + hdata[list].var1.var2...: startet hdata mittels einer Liste, zum Beispiel: + ${buffer[gui_buffers].full_name}: der vollständige Name des ersten Buffers, in der verknüpften Liste aller Buffer + ${plugin[weechat_plugins].name}: Name der ersten Erweiterung, in der verknüpften Liste aller Erweiterungen +Die vorhandenen Namen für hdata und Variablen sind in der "Anleitung für API Erweiterung", Bereich "weechat_hdata_get". beschrieben + +Beispiele: /eval -n ${weechat.look.scroll_amount} ==> 3 /eval -n ${window} ==> 0x2549aa0 /eval -n ${window.buffer} ==> 0x2549320 diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 0c7854ac2..51480e149 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -91,7 +91,8 @@ welche Pakete optional genutzt werden können. | libncursesw5-dev ^(2)^ | | *ja* | ncurses Oberfläche | libcurl4-gnutls-dev | | *ja* | URL Transfer | zlib1g-dev | | *ja* | Kompression für Pakete, die mittels Relay- (WeeChat Protokoll), Script-Erweiterung übertragen werden -| libgcrypt11-dev | | *ja* | SASL Authentifikation am IRC Server mittels DH-BLOWFISH Methode, Script-Erweiterung +// TRANSLATION MISSING +| libgcrypt11-dev | | *ja* | IRC SASL authentication (DH-BLOWFISH/DH-AES), Script-Erweiterung | libgnutls-dev | ≥ 2.2.0 | | SSL Verbindung zu einem IRC Server, Unterstützung von SSL in der Relay-Erweiterung | gettext | | | Internationalisierung (Übersetzung der Mitteilungen; Hauptsprache ist englisch) | ca-certificates | | | Zertifikate für SSL Verbindungen @@ -1834,14 +1835,20 @@ Für weiterreichende Informationen lesen Sie bitte: http://www.oftc.net/oftc/Nic SASL Authentifizierung ^^^^^^^^^^^^^^^^^^^^^^ -WeeChat unterstützt drei mögliche Verfahren bei einer SASL Authentifikation: -"plain" (Passwort liegt in Klarschrift vor), "dh-blowfish" (Passwort wird verschlüsselt) -oder "external" (SSL Zertifikat welches auf Client Seite vorliegt) +// TRANSLATION MISSING +WeeChat supports SASL authentication, using different mechanisms: + +* 'plain': Passwort liegt in Klarschrift vor +// TRANSLATION MISSING +* 'dh-blowfish': blowfish encrypted password +// TRANSLATION MISSING +* 'dh-aes': AES encrypted password +* 'external': SSL Zertifikat welches auf Client Seite vorliegt Optionen für Server sind: -* 'sasl_mechanism': Mechanismus welcher genutzt werden soll ("plain", - "dh-blowfish" oder "external") +// TRANSLATION MISSING +* 'sasl_mechanism': Mechanismus welcher genutzt werden soll (see above) * 'sasl_timeout': Zeitüberschreitung für Authentifizierung (in Sekunden) * 'sasl_username': Username (Nickname) * 'sasl_password': Passwort diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 395ecceea..11ab1ba60 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -519,9 +519,9 @@ ** values: any string (default value: `""`) * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism* -** description: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for crypted password, "external" for authentication using client side SSL cert` +** description: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for blowfish crypted password, "dh-aes" for AES crypted password, "external" for authentication using client side SSL cert` ** type: integer -** values: plain, dh-blowfish, external (default value: `plain`) +** values: plain, dh-blowfish, dh-aes, external (default value: `plain`) * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password* ** description: `password for SASL authentication` diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index c455c0149..335196542 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -91,7 +91,7 @@ compile WeeChat. | libncursesw5-dev ^(2)^ | | *yes* | ncurses interface | libcurl4-gnutls-dev | | *yes* | URL transfer | zlib1g-dev | | *yes* | compression of packets in relay plugin (weechat protocol), script plugin -| libgcrypt11-dev | | *yes* | SASL authentication with IRC server using DH-BLOWFISH mechanism, script plugin +| libgcrypt11-dev | | *yes* | IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin | libgnutls-dev | ≥ 2.2.0 | | SSL connection to IRC server, support of SSL in relay plugin | gettext | | | internationalization (translation of messages; base language is English) | ca-certificates | | | certificates for SSL connections @@ -1800,13 +1800,16 @@ For more information, look at http://www.oftc.net/oftc/NickServ/CertFP SASL authentication ^^^^^^^^^^^^^^^^^^^ -WeeChat supports SASL authentication, using three mechanisms: "plain" (plain -text password), "dh-blowfish" (encrypted password) or "external" (client side -SSL cert). +WeeChat supports SASL authentication, using different mechanisms: + +* 'plain': plain text password +* 'dh-blowfish': blowfish encrypted password +* 'dh-aes': AES encrypted password +* 'external': client side SSL cert Options in servers are: -* 'sasl_mechanism': mechanism to use ("plain", "dh-blowfish" or "external") +* 'sasl_mechanism': mechanism to use (see above) * 'sasl_timeout': timeout (in seconds) for authentication * 'sasl_username': username (nick) * 'sasl_password': password @@ -1819,7 +1822,7 @@ If you want to use "dh-blowfish" by default for all servers: [NOTE] The "gcrypt" library is required when compiling WeeChat in order to use -"dh-blowfish" mechanism (see <<dependencies,dependencies>>). +"dh-blowfish" and "dh-aes" mechanisms (see <<dependencies,dependencies>>). [[irc_tor_freenode]] Connect to Freenode with TOR/SASL diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index c2f4703b6..d53910856 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -519,9 +519,9 @@ ** valeurs: toute chaîne (valeur par défaut: `""`) * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism* -** description: `mécanisme pour l'authentification SASL: "plain" pour un mot de passe en clair, "dh-blowfish" pour un mot de passe chiffré, "external" pour une authentification en utilisant un certificat SSL côté client` +** description: `mécanisme pour l'authentification SASL: "plain" pour un mot de passe en clair, "dh-blowfish" pour un mot de passe chiffré avec blowfish, "dh-aes" pour un mot de passe chiffré avec AES, "external" pour une authentification en utilisant un certificat SSL côté client` ** type: entier -** valeurs: plain, dh-blowfish, external (valeur par défaut: `plain`) +** valeurs: plain, dh-blowfish, dh-aes, external (valeur par défaut: `plain`) * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password* ** description: `mot de passe pour l'authentification SASL` diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index bd1d8279a..8edc9b19f 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -93,7 +93,7 @@ compiler WeeChat. | libncursesw5-dev ^(2)^ | | *oui* | interface ncurses | libcurl4-gnutls-dev | | *oui* | transfert d'URL | zlib1g-dev | | *oui* | compression des paquets dans l'extension relay (protocole weechat), extension script -| libgcrypt11-dev | | *oui* | authentification SASL avec le serveur IRC, en utilisant le mécanisme DH-BLOWFISH, extension script +| libgcrypt11-dev | | *oui* | authentification IRC SASL (DH-BLOWFISH/DH-AES), extension script | libgnutls-dev | ≥ 2.2.0 | | connexion SSL au serveur IRC, support SSL dans l'extension relay | gettext | | | internationalisation (traduction des messages; la langue de base est l'anglais) | ca-certificates | | | certificats pour les connexions SSL @@ -1863,13 +1863,17 @@ Pour plus d'informations, consulter http://www.oftc.net/oftc/NickServ/CertFP Authentification avec SASL ^^^^^^^^^^^^^^^^^^^^^^^^^^ -WeeChat supporte l'authentification avec SASL, en utilisant trois mécanismes : -"plain" (mot de passe en clair), "dh-blowfish" (mot de passe chiffré) ou -"external" (certificat SSL côté client). +WeeChat supporte l'authentification avec SASL, en utilisant différents +mécanismes : + +* 'plain' : mot de passe en clair +* 'dh-blowfish' : mot de passe chiffré avec blowfish +* 'dh-aes' : mot de passe chiffré avec AES +* 'external' : certificat SSL côté client Les options dans le serveur sont : -* 'sasl_mechanism' : mécanisme à utiliser ("plain", "dh-blowfish" ou "external") +* 'sasl_mechanism' : mécanisme à utiliser (voir ci-dessus) * 'sasl_timeout' : délai d'attente maximum (en secondes) pour l'authentification * 'sasl_username' : nom d'utilisateur (pseudo) * 'sasl_password' : mot de passe diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index ca2c4af99..e30da0cb4 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -519,9 +519,9 @@ ** valori: qualsiasi stringa (valore predefinito: `""`) * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism* -** descrizione: `meccanismo per l'autenticazione SASL: "plain" per le password in chiaro, "dh-blowfish" per le password cifrate, "external" per l'autenticazione con certificati SSL lato client` +** descrizione: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for blowfish crypted password, "dh-aes" for AES crypted password, "external" for authentication using client side SSL cert` ** tipo: intero -** valori: plain, dh-blowfish, external (valore predefinito: `plain`) +** valori: plain, dh-blowfish, dh-aes, external (valore predefinito: `plain`) * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password* ** descrizione: `password per l'autenticazione SASL` diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index cf51e96b9..fb95f097a 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -97,7 +97,7 @@ compilare WeeChat. // TRANSLATION MISSING | zlib1g-dev | | *sì* | compression of packets in relay plugin (weechat protocol), script plugin // TRANSLATION MISSING -| libgcrypt11-dev | | *sì* | autenticazione SASL per i server IRC che utilizzano il meccanismo DH-BLOWFISH, script plugin +| libgcrypt11-dev | | *sì* | IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin // TRANSLATION MISSING | libgnutls-dev | ≥ 2.2.0 | | connessione SSL al server IRC, support of SSL in relay plugin | gettext | | | internazionalizzazione (traduzione dei messaggi; la lingua base è l'inglese) @@ -1843,13 +1843,20 @@ Per maggiori informazioni consultare http://www.oftc.net/oftc/NickServ/CertFP Autenticazione SASL ^^^^^^^^^^^^^^^^^^^ -WeeChat supporta l'autenticazione SASL, usando tre meccanismi: "plain" (password -in chiaro), "dh-blowfish" (password cifrata)" o "external" (certificato SSL da -lato client). +// TRANSLATION MISSING +WeeChat supports SASL authentication, using different mechanisms: + +* 'plain': password in chiaro +// TRANSLATION MISSING +* 'dh-blowfish': blowfish encrypted password +// TRANSLATION MISSING +* 'dh-aes': AES encrypted password +* 'external': certificato SSL da lato client Le opzioni nel server sono: -* 'sasl_mechanism': meccanismo da usare ("plain", "dh-blowfish" o "external") +// TRANSLATION MISSING +* 'sasl_mechanism': meccanismo da usare (see above) * 'sasl_timeout': timeout (in secondi) per l'autenticazione * 'sasl_username': nome utente (nick) * 'sasl_password': password diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index 702be0505..68fcd71ae 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -519,9 +519,9 @@ ** 値: 未制約文字列 (デフォルト値: `""`) * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism* -** 説明: `SASL 認証メカニズム: "plain" は平文パスワード、"dh-blowfish" は暗号パスワード、"external" はクライアントサイド SSL 証明書を利用した認証` +** 説明: `mechanism for SASL authentication: "plain" for plain text password, "dh-blowfish" for blowfish crypted password, "dh-aes" for AES crypted password, "external" for authentication using client side SSL cert` ** タイプ: 整数 -** 値: plain, dh-blowfish, external (デフォルト値: `plain`) +** 値: plain, dh-blowfish, dh-aes, external (デフォルト値: `plain`) * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password* ** 説明: `SASL 認証用パスワード` diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index d5ea656ef..122e4db8a 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -83,7 +83,8 @@ WeeChat は cmake または autotools を使ってコンパイルできます (c | libncursesw5-dev ^(2)^ | | *yes* | ncurses インターフェイス | libcurl4-gnutls-dev | | *yes* | URL 転送 | zlib1g-dev | | *yes* | relay プラグインでパケットを圧縮 (weechat プロトコル)、スクリプトプラグイン -| libgcrypt11-dev | | *yes* | DH-BLOWFISH メカニズムを用いた IRC サーバ用の SASL 認証、スクリプトプラグイン +// TRANSLATION MISSING +| libgcrypt11-dev | | *yes* | IRC SASL authentication (DH-BLOWFISH/DH-AES), script plugin | libgnutls-dev | ≥ 2.2.0 | | IRC サーバへの SSL 接続 | gettext | | | 国際化 (メッセージの翻訳; ベース言語は英語です) | ca-certificates | | | SSL 接続に必要な証明書、relay プラグインで SSL サポート @@ -1733,13 +1734,19 @@ $ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick [[irc_sasl_authentication]] ==== SASL 認証 ==== -WeeChat は SASL 認証をサポートしています。認証アルゴリズムは "plain" -(平文パスワード)、"dh-blowfish" (暗号化パスワード)、"external" -(クライアント側 SSL 証明書) の 3 つです。 +// TRANSLATION MISSING +WeeChat supports SASL authentication, using different mechanisms: + +// TRANSLATION MISSING +* 'plain': plain text password +* 'dh-blowfish': blowfish encrypted password +* 'dh-aes': AES encrypted password +* 'external': client side SSL cert サーバオプション: -* 'sasl_mechanism': 利用する認証メカニズム ("plain"、"dh-blowfish"、"external") +// TRANSLATION MISSING +* 'sasl_mechanism': 利用する認証メカニズム (see above) * 'sasl_timeout': 認証時のタイムアウト (秒単位) * 'sasl_username': ユーザ名 (ニックネーム) * 'sasl_password': パスワード |