From 040d92f5b9f48875bcea9253f67fd5f760b08cd7 Mon Sep 17 00:00:00 2001 From: "AYANOKOUZI, Ryuunosuke" Date: Mon, 15 Dec 2014 14:48:34 +0900 Subject: [PATCH 1/2] core: update Japanese translations --- po/ja.po | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/po/ja.po b/po/ja.po index 481f57979..505c2fbf0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "POT-Creation-Date: 2014-12-14 20:12+0100\n" -"PO-Revision-Date: 2014-12-13 09:11+0100\n" +"PO-Revision-Date: 2014-12-15 14:22+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -40,11 +40,11 @@ msgid "max chars" msgstr "最大文字数" msgid "" -"a WeeChat color name (default, black, (dark)gray, white, (light)red, " -"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a " -"terminal color number or an alias; attributes are allowed before color (for " -"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" " -"for italic, \"_\" for underline" +"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)" +"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal " +"color number or an alias; attributes are allowed before color (for text " +"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for " +"italic, \"_\" for underline" msgstr "" "WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、" "brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま" @@ -5958,8 +5958,8 @@ msgstr "" " - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n" " - ホスト名/ポート番号又は IP アドレス/ポート番号、デフォルトの" "ポート番号は 6667\n" -" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:" -"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n" +" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]" +"irc.example.org[:port][/#channel1][,#channel2[...]]\n" " 注意: アドレス/IP/URL を指定した場合、サーバを一時的に作ります " "(保存しません)、/help irc.look.temporary_servers を参照してください。\n" " option: サーバに関するオプション (ブール型オプションでは、value は無視さ" @@ -7190,6 +7190,9 @@ msgid "" "authentication problem, \"reconnect\" to schedule a reconnection to the " "server, \"disconnect\" to disconnect from server" msgstr "" +"SASL 認証が失敗した場合の挙動: 認証の問題を無視する場合は \"continue\"、サー" +"バへの再接続を予定する場合は \"reconnect\"、サーバから切断する場合は " +"\"disconnect\"" msgid "automatically connect to server when WeeChat is starting" msgstr "WeeChat の起動時に自動的にサーバに接続" @@ -7335,14 +7338,16 @@ msgid "" "joined (with server option \"autojoin\"); this is useful to open channels " "with always the same buffer numbers on startup" msgstr "" +"自動で参加した場合 (\"autojoin\" オプションで参加した場合) に、サーバから " +"JOIN を受信する前にチャンネルバッファを開く; チャンネルとバッファ番号の対応を" +"常に一致させたい場合に便利です" -#, fuzzy msgid "" "open channel buffer before the JOIN is received from server when it is " "manually joined (with /join command)" msgstr "" -"手動で参加した場合に、自動的にチャンネルバッファを移動 (/join コマンドを実行" -"したとき)" +"手動で参加した場合 (/join コマンドを実行した場合) に、サーバから JOIN を受信" +"する前にチャンネルバッファを開く" msgid "" "auto switch to channel buffer when it is auto joined (with server option " @@ -10936,8 +10941,8 @@ msgid "" "Examples (you can also look at default triggers with /trigger listdefault):\n" " add text attributes *bold*, _underline_ and /italic/ (only in user " "messages):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" -"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" +"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:" "italic}${re:1}${color:-italic}/\"\n" " hide nicklist bar on small terminals:\n" @@ -11013,8 +11018,8 @@ msgstr "" "\n" "例 (/trigger listdefault でデフォルトトリガを見ることができます):\n" " テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" -"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" +"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:" "italic}${re:1}${color:-italic}/\"\n" " 狭い端末ではニックネームリストバーを隠す:\n" From 1c3ee27c4648d852ebd478d9b97b5fb60cdbc549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Mon, 15 Dec 2014 07:43:13 +0100 Subject: [PATCH 2/2] doc: remove SASL mechanism "dh-blowfish" from docs --- doc/de/weechat_faq.de.asciidoc | 1 - doc/de/weechat_quickstart.de.asciidoc | 1 - doc/de/weechat_user.de.asciidoc | 21 +++++---------------- doc/en/weechat_faq.en.asciidoc | 1 - doc/en/weechat_quickstart.en.asciidoc | 1 - doc/en/weechat_user.en.asciidoc | 21 +++++---------------- doc/es/weechat_quickstart.es.asciidoc | 1 - doc/fr/weechat_faq.fr.asciidoc | 1 - doc/fr/weechat_quickstart.fr.asciidoc | 1 - doc/fr/weechat_user.fr.asciidoc | 22 +++++----------------- doc/it/weechat_faq.it.asciidoc | 1 - doc/it/weechat_quickstart.it.asciidoc | 1 - doc/it/weechat_user.it.asciidoc | 23 ++++++----------------- doc/ja/weechat_faq.ja.asciidoc | 1 - doc/ja/weechat_quickstart.ja.asciidoc | 1 - doc/ja/weechat_user.ja.asciidoc | 21 +++++---------------- doc/pl/weechat_faq.pl.asciidoc | 1 - doc/pl/weechat_quickstart.pl.asciidoc | 1 - doc/pl/weechat_user.pl.asciidoc | 22 +++++----------------- doc/ru/weechat_quickstart.ru.asciidoc | 1 - 20 files changed, 31 insertions(+), 113 deletions(-) diff --git a/doc/de/weechat_faq.de.asciidoc b/doc/de/weechat_faq.de.asciidoc index 24b947d30..dac20b5e0 100644 --- a/doc/de/weechat_faq.de.asciidoc +++ b/doc/de/weechat_faq.de.asciidoc @@ -576,7 +576,6 @@ Sollte der Server SASL unterstützen, ist es ratsam auf diese Funktion zurückzu und sich nicht mittels "nickserv" zu authentifizieren. Zum Beispiel: ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "meinNick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/de/weechat_quickstart.de.asciidoc b/doc/de/weechat_quickstart.de.asciidoc index 1a72fbf93..40adf0533 100644 --- a/doc/de/weechat_quickstart.de.asciidoc +++ b/doc/de/weechat_quickstart.de.asciidoc @@ -163,7 +163,6 @@ Sollte der Server SASL unterstützen, kann man sich damit automatisch Authentifi (dadurch identifiziert man sich beim Server, bevor man Channels (Chaträume) betritt): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc index 5b095f365..26580c150 100644 --- a/doc/de/weechat_user.de.asciidoc +++ b/doc/de/weechat_user.de.asciidoc @@ -2212,11 +2212,15 @@ Für weiterreichende Informationen lesen Sie bitte: http://www.oftc.net/oftc/Nic WeeChat unterstützt eine SASL Authentifikation, mittels verschiedener Mechanismen: -* 'plain': Passwort liegt in Klarschrift vor +* 'plain': Passwort liegt in Klarschrift vor (Standard) * 'dh-blowfish': Passwort wird mittels blowfish verschlüsselt * 'dh-aes': Passwort wird mittels AES verschlüsselt * 'external': SSL Zertifikat welches auf Client Seite vorliegt +[NOTE] +Die "gcrypt" Bibliothek wird beim kompilieren von WeeChat benötigt um +"dh-blowfish"nutzen zu können (siehe <>). + Optionen für Server sind: * 'sasl_mechanism': Mechanismus welcher genutzt werden soll (siehe oben) @@ -2224,16 +2228,6 @@ Optionen für Server sind: * 'sasl_username': Username (Nickname) * 'sasl_password': Passwort -Soll "dh-blowfish" standardmäßig auf allen Servern angewandt werden: - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -Die "gcrypt" Bibliothek wird beim kompilieren von WeeChat benötigt um -"dh-blowfish"nutzen zu können (siehe <>). - [[irc_tor_freenode]] ==== Verbindung zu Freenode mittels TOR/SASL herstellen @@ -2241,10 +2235,6 @@ Neben der Möglichkeit eine Verbindung zum Freenode Server mittels SSL aufzubaue kann man außerdem eine Verbindung via TOR (https://www.torproject.org/) herstellen. Dies dient dazu die eigene Privatsphäre und Sicherheit im Internet zu erhöhen. -Zuerst sollte man sicher gehen, dass WeeChat mit <> kompiliert -wurde (sofern WeeChat aus den Quellen erstellt wurde); es ist nicht verpflichtend, allerdings -bietet "dh-blowfish" eine größere Sicherheit als eine "plain" Authentifikation mittels SASL. - Im ersten Schritt muss TOR installiert werden. Für Debian (und Derivate): ---- @@ -2273,7 +2263,6 @@ Der Proxy muss für TOR angelegt werden: Die SASL Authentifikation einstellen: ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "your_nickname" /set irc.server.freenode-tor.sasl_password "your_password" ---- diff --git a/doc/en/weechat_faq.en.asciidoc b/doc/en/weechat_faq.en.asciidoc index 0d63c4baa..3d07be583 100644 --- a/doc/en/weechat_faq.en.asciidoc +++ b/doc/en/weechat_faq.en.asciidoc @@ -549,7 +549,6 @@ If server supports SASL, you should use that instead of sending command for nickserv authentication, for example: ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/en/weechat_quickstart.en.asciidoc b/doc/en/weechat_quickstart.en.asciidoc index ba8cd3a3e..dbec728e2 100644 --- a/doc/en/weechat_quickstart.en.asciidoc +++ b/doc/en/weechat_quickstart.en.asciidoc @@ -154,7 +154,6 @@ If SASL is available on server, you can use it for authentication (you will be identified before you join channels): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc index b21cb88ea..0c1597080 100644 --- a/doc/en/weechat_user.en.asciidoc +++ b/doc/en/weechat_user.en.asciidoc @@ -2166,11 +2166,15 @@ For more information, look at http://www.oftc.net/oftc/NickServ/CertFP WeeChat supports SASL authentication, using different mechanisms: -* 'plain': plain text password +* 'plain': plain text password (default) * 'dh-blowfish': blowfish encrypted password * 'dh-aes': AES encrypted password * 'external': client side SSL cert +[NOTE] +The "gcrypt" library is required when compiling WeeChat in order to use +"dh-blowfish" and "dh-aes" mechanisms (see <>). + Options in servers are: * 'sasl_mechanism': mechanism to use (see above) @@ -2178,16 +2182,6 @@ Options in servers are: * 'sasl_username': username (nick) * 'sasl_password': password -If you want to use "dh-blowfish" by default for all servers: - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -The "gcrypt" library is required when compiling WeeChat in order to use -"dh-blowfish" and "dh-aes" mechanisms (see <>). - [[irc_tor_freenode]] ==== Connect to Freenode with TOR/SASL @@ -2195,10 +2189,6 @@ In addition to SSL, Freenode servers support connections with TOR (https://www.torproject.org/), a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. -First, make sure to have WeeChat compiled with <> -(if built from sources); it's not mandatory, but "dh-blowfish" ensures stronger -security compared to "plain" authentication system with SASL. - In first place, install TOR. For Debian (and derived): ---- @@ -2227,7 +2217,6 @@ Set proxy for TOR: Set SASL authentication: ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "your_nickname" /set irc.server.freenode-tor.sasl_password "your_password" ---- diff --git a/doc/es/weechat_quickstart.es.asciidoc b/doc/es/weechat_quickstart.es.asciidoc index 93c0b09bd..42273a271 100644 --- a/doc/es/weechat_quickstart.es.asciidoc +++ b/doc/es/weechat_quickstart.es.asciidoc @@ -169,7 +169,6 @@ If SASL is available on server, you can use it for authentication (you will be identified before you join channels): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "nick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/fr/weechat_faq.fr.asciidoc b/doc/fr/weechat_faq.fr.asciidoc index 7ab9c8572..479e1b353 100644 --- a/doc/fr/weechat_faq.fr.asciidoc +++ b/doc/fr/weechat_faq.fr.asciidoc @@ -572,7 +572,6 @@ Si le serveur supporte SASL, vous devriez l'utiliser au lieu d'envoyer une commande pour l'authentification avec nickserv, par exemple : ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/fr/weechat_quickstart.fr.asciidoc b/doc/fr/weechat_quickstart.fr.asciidoc index 199e3c5e5..c5455e035 100644 --- a/doc/fr/weechat_quickstart.fr.asciidoc +++ b/doc/fr/weechat_quickstart.fr.asciidoc @@ -161,7 +161,6 @@ Si SASL est disponible sur le serveur, vous pouvez l'utiliser pour l'authentification (vous serez identifié avant de rejoindre les canaux) : ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "pseudo" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc index 8492b06d0..81a130e87 100644 --- a/doc/fr/weechat_user.fr.asciidoc +++ b/doc/fr/weechat_user.fr.asciidoc @@ -2241,11 +2241,15 @@ Pour plus d'informations, consulter http://www.oftc.net/oftc/NickServ/CertFP WeeChat supporte l'authentification avec SASL, en utilisant différents mécanismes : -* 'plain' : mot de passe en clair +* 'plain' : mot de passe en clair (par défaut) * 'dh-blowfish' : mot de passe chiffré avec blowfish * 'dh-aes' : mot de passe chiffré avec AES * 'external' : certificat SSL côté client +[NOTE] +La librairie "gcrypt" est requise lors de la compilation de WeeChat pour +utiliser le mécanisme "dh-blowfish" (voir <>). + Les options dans le serveur sont : * 'sasl_mechanism' : mécanisme à utiliser (voir ci-dessus) @@ -2253,16 +2257,6 @@ Les options dans le serveur sont : * 'sasl_username' : nom d'utilisateur (pseudo) * 'sasl_password' : mot de passe -Si vous voulez utiliser "dh-blowfish" par défaut pour tous les serveurs : - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -La librairie "gcrypt" est requise lors de la compilation de WeeChat pour -utiliser le mécanisme "dh-blowfish" (voir <>). - [[irc_tor_freenode]] ==== Connexion à Freenode avec TOR/SASL @@ -2270,11 +2264,6 @@ En plus du SSL, les serveurs Freenode supportent les connexions avec TOR (https://www.torproject.org/), un réseau de tunnels virtuels qui permet aux personnes et groupes d'améliorer leur vie privée et sécurité sur Internet. -Premièrement, assurez-vous d'avoir compilé WeeChat avec -<> (si construit depuis les sources); ce n'est -pas obligatoire, mais "dh-blowfish" assure une meilleure sécurité comparé à -l'authentification "plain" avec SASL. - En premier lieu, installez TOR. Pour Debian (et dérivés) : ---- @@ -2303,7 +2292,6 @@ Définissez le proxy pour TOR : Définissez l'authentification SASL : ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "votre_pseudo" /set irc.server.freenode-tor.sasl_password "votre_mot_de_passe" ---- diff --git a/doc/it/weechat_faq.it.asciidoc b/doc/it/weechat_faq.it.asciidoc index 87c25b59b..d45f0cd2f 100644 --- a/doc/it/weechat_faq.it.asciidoc +++ b/doc/it/weechat_faq.it.asciidoc @@ -577,7 +577,6 @@ Se il server supporta SASL, dovrebbe essere utilizzato invece di inviare il comando di autenticazione con nickserv, ad esempio: ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/it/weechat_quickstart.it.asciidoc b/doc/it/weechat_quickstart.it.asciidoc index 4e0c5c51c..296f4a406 100644 --- a/doc/it/weechat_quickstart.it.asciidoc +++ b/doc/it/weechat_quickstart.it.asciidoc @@ -161,7 +161,6 @@ Se SASL è disponibile sul server, è possibile usarlo per l'autenticazione (l'autenticazione avviene prima dell'ingresso nei canali): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc index 25b9420c5..828700cc7 100644 --- a/doc/it/weechat_user.it.asciidoc +++ b/doc/it/weechat_user.it.asciidoc @@ -2267,13 +2267,18 @@ Per maggiori informazioni consultare http://www.oftc.net/oftc/NickServ/CertFP // TRANSLATION MISSING WeeChat supports SASL authentication, using different mechanisms: -* 'plain': password in chiaro +// TRANSLATION MISSING +* 'plain': password in chiaro (default) // TRANSLATION MISSING * 'dh-blowfish': blowfish encrypted password // TRANSLATION MISSING * 'dh-aes': AES encrypted password * 'external': certificato SSL da lato client +[NOTE] +La libreria "gcrypt" è richiesta per compilare WeeChat al fine di usare il +meccanismo "dh-blowfish" (consultare <>). + Le opzioni nel server sono: // TRANSLATION MISSING @@ -2282,16 +2287,6 @@ Le opzioni nel server sono: * 'sasl_username': nome utente (nick) * 'sasl_password': password -Se si desidera usare "dh-blowfish" in tutti i server: - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -La libreria "gcrypt" è richiesta per compilare WeeChat al fine di usare il -meccanismo "dh-blowfish" (consultare <>). - [[irc_tor_freenode]] ==== Connessione a Freenode con TOR/SASL @@ -2299,11 +2294,6 @@ Oltre ad SSL, i server Freenode supportano connessioni con TOR (https://www.torproject.org), una rete di tunnel virtuali che consente ad utenti e gruppi di migliorare la propria privacy e la sicurezza su Internet. -Per prima cosa, assicurarsi che WeeChat sia compilato con -<> (se compilato da sorgenti); non è -obbligatorio, ma "dh-blowfish" assicura una maggiore sicurezza rispetto al -sistema di autenticazione "plain" (in chiaro) con SASL. - Il primo passo consiste nell'installare TOR. Per Debian (e derivate): ---- @@ -2332,7 +2322,6 @@ Impostare il proxy per TOR: Impostare l'autenticazione SASL: ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "your_nickname" /set irc.server.freenode-tor.sasl_password "your_password" ---- diff --git a/doc/ja/weechat_faq.ja.asciidoc b/doc/ja/weechat_faq.ja.asciidoc index 0ef88b3a5..45fedbad0 100644 --- a/doc/ja/weechat_faq.ja.asciidoc +++ b/doc/ja/weechat_faq.ja.asciidoc @@ -547,7 +547,6 @@ oauth を使うにはパスワードを "oauth:XXXX" のように指定してく SASL を利用する方が良いです。例えば: ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/ja/weechat_quickstart.ja.asciidoc b/doc/ja/weechat_quickstart.ja.asciidoc index 59ecf58e6..f11025c19 100644 --- a/doc/ja/weechat_quickstart.ja.asciidoc +++ b/doc/ja/weechat_quickstart.ja.asciidoc @@ -154,7 +154,6 @@ Freenode はデフォルトの鍵サイズ 2048 をサポートしません、 (チャンネル参加前にニックネーム認証が行われるでしょう): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc index cac5c926a..a856ae8bf 100644 --- a/doc/ja/weechat_user.ja.asciidoc +++ b/doc/ja/weechat_user.ja.asciidoc @@ -2165,11 +2165,15 @@ $ openssl req -nodes -newkey rsa:2048 -keyout nick.pem -x509 -days 365 -out nick WeeChat は SASL 認証をサポートします、以下の認証メカニズムを利用できます: -* 'plain': 平文パスワード +* 'plain': 平文パスワード (デフォルト) * 'dh-blowfish': blowfish 暗号パスワード * 'dh-aes': AES 暗号パスワード * 'external': クライアント側 SSL 証明書 +[NOTE] +"dh-blowfish" メカニズムを利用する場合、"gcrypt" ライブラリが +WeeChat のコンパイル時に必要です (<>を参照)。 + サーバオプション: * 'sasl_mechanism': 利用する認証メカニズム (上記参照) @@ -2177,16 +2181,6 @@ WeeChat は SASL 認証をサポートします、以下の認証メカニズム * 'sasl_username': ユーザ名 (ニックネーム) * 'sasl_password': パスワード -"dh-blowfish" メカニズムをデフォルトで全てのサーバに対して利用する場合: - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -"dh-blowfish" メカニズムを利用する場合、"gcrypt" ライブラリが -WeeChat のコンパイル時に必要です (<>を参照)。 - [[irc_tor_freenode]] ==== TOR/SASL を使って Freenode に接続する場合 @@ -2194,10 +2188,6 @@ SSL に加えて、Freenode サーバは TOR (https://www.torproject.org/) 経由の接続をサポートしています。TOR とはバーチャルトンネルのネットワークで、 これを使うことで個人やグループがインターネット利用に伴うプライバシーとセキュリティを向上させることができます。 -最初に、WeeChat が <> を有効化してコンパイルされていることを確認してください -(ソースからビルドしている場合); これは必須ではありませんが、SASL を "plain" 認証メカニズムで利用するよりも -"dh-blowfish" のほうが強固なセキュリティになります。 - 最初に、TOR をインストールしてください。Debian (とその派生ディストリビューション) の場合: ---- @@ -2226,7 +2216,6 @@ TOR プロキシを設定: SASL 認証を設定: ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "your_nickname" /set irc.server.freenode-tor.sasl_password "your_password" ---- diff --git a/doc/pl/weechat_faq.pl.asciidoc b/doc/pl/weechat_faq.pl.asciidoc index 36f4fba59..ed68809b7 100644 --- a/doc/pl/weechat_faq.pl.asciidoc +++ b/doc/pl/weechat_faq.pl.asciidoc @@ -554,7 +554,6 @@ Jeśli serwer wspiera SASL, możesz użyć tego zamiast wysyłać komendę do ni na przykład: ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "nick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/pl/weechat_quickstart.pl.asciidoc b/doc/pl/weechat_quickstart.pl.asciidoc index b6ba4ad2e..67109774a 100644 --- a/doc/pl/weechat_quickstart.pl.asciidoc +++ b/doc/pl/weechat_quickstart.pl.asciidoc @@ -154,7 +154,6 @@ Jeśli SASL jest dostępny na serwerze, można użyć go do uwierzytelnienia (zo zidentyfikowany przed wejściem na kanał): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mójnick" /set irc.server.freenode.sasl_password "xxxxxxx" ---- diff --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc index ede53c983..c63f16c18 100644 --- a/doc/pl/weechat_user.pl.asciidoc +++ b/doc/pl/weechat_user.pl.asciidoc @@ -2187,11 +2187,15 @@ Więcej informacji można znaleźć pod adresem: http://www.oftc.net/oftc/NickSe WeeChat wspiera uwierzytelnianie SASL, używając różnych mechanizmów: -* 'plain': hasło w czystym tekście +* 'plain': hasło w czystym tekście (domyślne) * 'dh-blowfish': hasło zaszyfrowane algorytmem blowfish * 'dh-aes': hasło zaszyfrowane algorytmem AES * 'external': certyfikat SSL po stronie klienta +[NOTE] +Biblioteka "gcrypt" jest wymagana podczas kompilacji WeeChat w celu dodania +wsparcia dla mechanizmów "dh-blowfish" i "dh-aes" (zobacz <>). + Opcje dla serwerów to: * 'sasl_mechanism': mechanizm do użycia (zobacz wyżej) @@ -2199,16 +2203,6 @@ Opcje dla serwerów to: * 'sasl_username': nazwa użytkownika (nick) * 'sasl_password': hasło -Jeśli chcesz użyć "dh-blowfish" domyślnie dla wszystkich serwerów: - ----- -/set irc.server_default.sasl_mechanism dh-blowfish ----- - -[NOTE] -Biblioteka "gcrypt" jest wymagana podczas kompilacji WeeChat w celu dodania -wsparcia dla mechanizmów "dh-blowfish" i "dh-aes" (zobacz <>). - [[irc_tor_freenode]] ==== Połączenie z siecią Freenode za pomocą TOR/SASL @@ -2216,11 +2210,6 @@ Jako dodatek do SSL, serwery Freenode wspierają połączenia za pomocą sieci T (https://www.torproject.org/), sieci wirtualnych tuneli umożliwiających ludziom oraz grupom polepszyć swoją prywatność i bezpieczeństwo w Internecie. -Najpierw należy się upewnić, że WeeChat został skompilowany z <> -(jeśli budowaliśmy go sami ze źródeł); nie jest to konieczne, ale "dh-blowfish" -zapewnia większe bezpieczeństwo w porównaniu z uwierzytelnianiem "plain" za -pomocą SASL. - Pierwszym krokiem jest instalacja TORa. Dla Debiana (i pochodnych): ---- @@ -2249,7 +2238,6 @@ Ustaw proxy dla TOR: Ustaw uwierzytelnianie SASL: ---- -/set irc.server.freenode-tor.sasl_mechanism dh-blowfish /set irc.server.freenode-tor.sasl_username "twój_użytkownik" /set irc.server.freenode-tor.sasl_password "twoje_hasło" ---- diff --git a/doc/ru/weechat_quickstart.ru.asciidoc b/doc/ru/weechat_quickstart.ru.asciidoc index d6f19c069..a9f3f8e0e 100644 --- a/doc/ru/weechat_quickstart.ru.asciidoc +++ b/doc/ru/weechat_quickstart.ru.asciidoc @@ -156,7 +156,6 @@ to 1024. (вы будете идентифицированы до того, как присоединиться к каналам): ---- -/set irc.server_default.sasl_mechanism dh-blowfish /set irc.server.freenode.sasl_username "mynick" /set irc.server.freenode.sasl_password "xxxxxxx" ----