1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 07:46:38 +02:00

irc: evaluate content of server options "username" and "realname"

This commit is contained in:
Sebastien Helleu
2014-02-28 15:00:39 +01:00
parent 4196dcf7a5
commit cf48fa4642
29 changed files with 333 additions and 210 deletions
+1
View File
@@ -41,6 +41,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: add integer return code for functions hook_{signal|hsignal}_send
* alias: change default command for alias /beep to "/print -beep"
* guile: fix module used after unload of a script
* irc: evaluate content of server options "username" and "realname"
* irc: set option irc.network.autoreconnect_delay_max to 600 by default,
increase max value to 604800 seconds (7 days)
* irc: fix read of MODES server value when in commands /op, /deop, /voice,
+2 -2
View File
@@ -534,7 +534,7 @@
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** Beschreibung: `Realen Namen bei diesem Server nutzen`
** Beschreibung: `real name to use on server (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
@@ -589,7 +589,7 @@
** Werte: on, off (Standardwert: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** Beschreibung: `Benutzername für diesen Server`
** Beschreibung: `user name to use on server (note: content is evaluated, see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
+25 -25
View File
@@ -703,37 +703,37 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite
set <name> <value>
del <name>
passphrase: ändern der Passphrase (ohne Passphrase, werden die Daten in der Datei sec.conf in Klartext gesichert)
-delete: löscht Passphrase
decrypt: entschlüsselt Daten nachträglich (dies passiert nur falls die Passphrase beim Start nicht angegeben wurde)
-discard: verwirft alle verschlüsselten Daten
set: fügt eine schutzwürdige Information hinzu oder ändert eine bestehende
del: entfernt eine schutzwürdige Information
passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
-delete: delete passphrase
decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
-discard: discard all data still encrypted
set: add or change secured data
del: delete secured data
Ohne Angabe von Argumenten wird ein neuer Buffer geöffnet und die schutzwürdigen Informationen können dort eingesehen werden.
Without argument, this command displays secured data in a new buffer.
Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat beim Start die Passphrase ab.
Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet).
When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden:
- Argument in der Befehlszeile für "--run-command"
- Option weechat.startup.command_{before|after}_plugins
- Proxy-Optionen: username, password
- IRC Server Optionen: autojoin, command, password, sasl_{username|password}
- Option relay.network.password
- Befehl /eval.
Secured data with format ${sec.data.xxx} can be used in:
- command line argument "--run-command"
- options weechat.startup.command_{before|after}_plugins
- proxy options: username, password
- irc server options: autojoin, command, password, sasl_{username|password}, username, realname
- option relay.network.password
- command /eval.
Beispiele:
setzen einer Passphrase:
/secure passphrase Dies ist meine Passphrase
verschlüsselt freenode SASL Passwort:
/secure set freenode meinPasswort
Examples:
set a passphrase:
/secure passphrase this is my passphrase
encrypt freenode SASL password:
/secure set freenode mypassword
/set irc.server.freenode.sasl_password "${sec.data.freenode}"
verschlüsselt oftc Passwort für nickserv:
/secure set oftc meinPasswort
encrypt oftc password for nickserv:
/secure set oftc mypassword
/set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
alias um den eigenen Nick zu ghosten:
/alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec.data.freenode}
alias to ghost the nick "mynick":
/alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
----
[[command_weechat_set]]
+2 -2
View File
@@ -534,7 +534,7 @@
** values: any string (default value: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** description: `real name to use on server`
** description: `real name to use on server (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
@@ -589,7 +589,7 @@
** values: on, off (default value: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** description: `user name to use on server`
** description: `user name to use on server (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
+1 -1
View File
@@ -719,7 +719,7 @@ Secured data with format ${sec.data.xxx} can be used in:
- command line argument "--run-command"
- options weechat.startup.command_{before|after}_plugins
- proxy options: username, password
- irc server options: autojoin, command, password, sasl_{username|password}
- irc server options: autojoin, command, password, sasl_{username|password}, username, realname
- option relay.network.password
- command /eval.
+2 -2
View File
@@ -534,7 +534,7 @@
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** description: `nom réel pour le serveur`
** description: `nom réel pour le serveur (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -589,7 +589,7 @@
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** description: `nom d'utilisateur pour le serveur`
** description: `nom d'utilisateur pour le serveur (note: le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
+1 -1
View File
@@ -719,7 +719,7 @@ Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisée
- le paramètre de ligne de commande "--run-command"
- les options weechat.startup.command_{before|after}_plugins
- les options de proxy: username, password
- les options de serveur irc: autojoin, command, password, sasl_{username|password}
- les options de serveur irc: autojoin, command, password, sasl_{username|password}, username, realname
- l'option relay.network.password
- la commande /eval.
+2 -2
View File
@@ -534,7 +534,7 @@
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** descrizione: `nome reale da usare sul server`
** descrizione: `real name to use on server (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
@@ -589,7 +589,7 @@
** valori: on, off (valore predefinito: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** descrizione: `nome utente da usare sul server`
** descrizione: `user name to use on server (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
+25 -25
View File
@@ -703,37 +703,37 @@ Senza argomento, vengono salvati tutti i file (WeeChat e plugin).
set <nome> <valore>
del <nome>
passphrase: cambia la chiave di cifratura (senza la chiave di cifratura, i dati vengono salvati in chiaron nel file sec.conf)
-delete: elimina la chiave di cifratura
decrypt: decifra tutti i dati ancora cifrati (accade solo se la chiave di cifratura non è stata digitata all'avvio)
-discard: scarta tutti i dati ancora cifrati
set: aggiunge o modifica dati sicuri
del: elimina dati sicuri
passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
-delete: delete passphrase
decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
-discard: discard all data still encrypted
set: add or change secured data
del: delete secured data
Senza argomento, questo comando mostra i dati messi al sicuro in un nuovo buffer.
Without argument, this command displays secured data in a new buffer.
Quando viene usata una chiave di cifratura (dati cifrati), questa viene richiesta da WeeChat all'avvio.
È possibile impostare la variabile d'ambiente "WEECHAT_PASSPHRASE" per prevenire il prompt (questa stessa variabile viene usata da WeeChat con il comando /upgrade).
When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
I dati messi al sicuro con il formato ${sec.data.xxx} possono essere usati in questo modo:
- argomento della riga di comando "--run-command"
- opzioni weechat.startup.command_{before|after}_plugins
- opzioni del proxy: nome utente, password
- opzioni del server irc: autojoin, comando, password, sasl_{username|password}
- opzione relay.network.password
- comando /eval.
Secured data with format ${sec.data.xxx} can be used in:
- command line argument "--run-command"
- options weechat.startup.command_{before|after}_plugins
- proxy options: username, password
- irc server options: autojoin, command, password, sasl_{username|password}, username, realname
- option relay.network.password
- command /eval.
Esempi:
imposta una chiave di cifratura:
/secure passphrase questa è la mia chiave di cifratura
cifra la password SASL di freenode:
/secure set freenode miapassword
Examples:
set a passphrase:
/secure passphrase this is my passphrase
encrypt freenode SASL password:
/secure set freenode mypassword
/set irc.server.freenode.sasl_password "${sec.data.freenode}"
cifra la password di oftc per nickserv:
/secure set oftc miapassword
encrypt oftc password for nickserv:
/secure set oftc mypassword
/set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
alias per il "ghost" del nick "mionick":
/alias ghost /eval /msg -server freenode nickserv ghost mionick ${sec.data.freenode}
alias to ghost the nick "mynick":
/alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
----
[[command_weechat_set]]
+2 -2
View File
@@ -534,7 +534,7 @@
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** 説明: `サーバで使用するリアルネーム`
** 説明: `real name to use on server (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
@@ -589,7 +589,7 @@
** 値: on, off (デフォルト値: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** 説明: `サーバで使用するユーザ名`
** 説明: `user name to use on server (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
+21 -21
View File
@@ -703,36 +703,36 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
set <name> <value>
del <name>
passphrase: パスフレーズを変更 (パスフレーズがない場合、sec.conf ファイルに平文でデータを保存します)
-delete: パスフレーズを削除
decrypt: 暗号化されているデータを復号化 (起動時にパスフレーズが設定されていない場合に起きます)
-discard: 全ての暗号化データを破棄
set: 保護データを追加または変更
del: 保護データを削除
passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
-delete: delete passphrase
decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
-discard: discard all data still encrypted
set: add or change secured data
del: delete secured data
引数がない場合、新しいバッファに保護データを表示します。
Without argument, this command displays secured data in a new buffer.
パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。
環境変数 "WEECHAT_PASSPHRASE" を利用すれば入力を回避できます (WeeChat /upgrade の時に同じ変数を利用します)。
When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
${sec.data.xxx} の形でフォーマットされた保護データは以下の様に利用できます:
- コマンドライン引数 "--run-command"
- weechat.startup.command_{before|after}_plugins オプション
- プロキシオプション: usernamepassword
- irc サーバオプション: autojoincommandpasswordsasl_{username|password}
- relay.network.password オプション
- /eval コマンド。
Secured data with format ${sec.data.xxx} can be used in:
- command line argument "--run-command"
- options weechat.startup.command_{before|after}_plugins
- proxy options: username, password
- irc server options: autojoin, command, password, sasl_{username|password}, username, realname
- option relay.network.password
- command /eval.
:
パスフレーズを設定:
Examples:
set a passphrase:
/secure passphrase this is my passphrase
freenode SASL パスワードを暗号化:
encrypt freenode SASL password:
/secure set freenode mypassword
/set irc.server.freenode.sasl_password "${sec.data.freenode}"
oftc の nickserv 用パスワードを暗号化:
encrypt oftc password for nickserv:
/secure set oftc mypassword
/set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
ニックネーム "mynick" を取り戻すためのエイリアス ghost を設定
alias to ghost the nick "mynick":
/alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
----
+2 -2
View File
@@ -534,7 +534,7 @@
** wartości: dowolny ciąg (domyślna wartość: `""`)
* [[option_irc.server_default.realname]] *irc.server_default.realname*
** opis: `prawdziwa nazwa używana na serwerze`
** opis: `real name to use on server (note: content is evaluated, see /help eval)`
** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `""`)
@@ -589,7 +589,7 @@
** wartości: on, off (domyślna wartość: `on`)
* [[option_irc.server_default.username]] *irc.server_default.username*
** opis: `nazwa użytkownika używana na serwerze`
** opis: `user name to use on server (note: content is evaluated, see /help eval)`
** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `""`)
+25 -25
View File
@@ -703,37 +703,37 @@ Bez podania argumentu wszystkie pliki (WeeChat oraz wtyczki) zostaną przeładow
set <nazwa> <wartość>
del <nazwa>
passphrase: zmienia hasło (bez hasła dane są przechowywane w postaci tekstu w pliku sec.conf)
-delete: kasuje hasło
decrypt: rozszyfrowuje dane będące ciągle zaszyfrowane (zdarza się to tylko jeśli hasło nie zostało podane przy uruchomieniu)
-discard: odrzuca wszystkie nadal zaszyfrowane dane
set: dodaje lub zmienia zaszyfrowane dane
del: kasuje zaszyfrowane dane
passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf)
-delete: delete passphrase
decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup)
-discard: discard all data still encrypted
set: add or change secured data
del: delete secured data
Bez argumentu, komenda wyświetli zabezpieczone dane w nowym buforze.
Without argument, this command displays secured data in a new buffer.
Jeśli używane jest hasło (dane zaszyfrowane), należy je podać podczas startu WeeChat.
Jest możliwe ustawienie zmiennej środowiskowej "WEECHAT_PASSPHRASE", aby nie podawać hasła przy uruchomieniu (ta sama zmienna jest używana przez WeeChat podczas wykonywania /upgrade).
When a passphrase is used (data encrypted), it is asked by WeeChat on startup.
It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade).
Zabezpieczone dane w formacie ${sec.data.xxx} można użyć w:
- argumencie w linii poleceń "--run-command"
- opcjach weechat.startup.command_{before|after}_plugins
- opcjach proxy: username, password
- opcji serwera irc: autojoin, command, password, sasl_{username|password}
- opcji weechat.startup.command_{before|after}_plugins
- komendzie /eval.
Secured data with format ${sec.data.xxx} can be used in:
- command line argument "--run-command"
- options weechat.startup.command_{before|after}_plugins
- proxy options: username, password
- irc server options: autojoin, command, password, sasl_{username|password}, username, realname
- option relay.network.password
- command /eval.
Przykłady:
ustawienie hasła:
/secure passphrase to jest moje hasło
zaszyfrowanie hasła dla freenode SASL:
/secure set freenode mojehasło
Examples:
set a passphrase:
/secure passphrase this is my passphrase
encrypt freenode SASL password:
/secure set freenode mypassword
/set irc.server.freenode.sasl_password "${sec.data.freenode}"
zaszyfrowanie hasła dla nickserva na serwerze oftc:
/secure set oftc mojehasło
encrypt oftc password for nickserv:
/secure set oftc mypassword
/set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}"
alias dla polecenia ghost dla nicka "mójnick":
/alias ghost /eval /msg -server freenode nickserv ghost mójnick ${sec.data.freenode}
alias to ghost the nick "mynick":
/alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode}
----
[[command_weechat_set]]
+14 -6
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:24+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2117,7 +2117,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6315,11 +6315,13 @@ msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server"
msgid "nicknames to use on server (separated by comma)"
msgstr "přezdívky použité na serveru (oddělené čárkami)"
msgid "user name to use on server"
msgstr "uživatelské jméno použité na serveru"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
msgid "real name to use on server"
msgstr "skutečné jméno použité na serveru"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -10445,3 +10447,9 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
#~ msgid "user name to use on server"
#~ msgstr "uživatelské jméno použité na serveru"
#~ msgid "real name to use on server"
#~ msgstr "skutečné jméno použité na serveru"
+17 -6
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:24+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -2385,6 +2385,7 @@ msgstr ""
"passphrase <passphrase>|-delete || decrypt <passphrase>|-discard || set "
"<name> <value> || del <name>"
#, fuzzy
msgid ""
"passphrase: change the passphrase (without passphrase, data is stored as "
"plain text in file sec.conf)\n"
@@ -2407,7 +2408,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -7112,11 +7113,15 @@ msgstr ""
"Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma "
"getrennt)"
msgid "user name to use on server"
msgstr "Benutzername für diesen Server"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"Username für Proxy Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"
msgid "real name to use on server"
msgstr "Realen Namen bei diesem Server nutzen"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"Username für Proxy Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -11603,3 +11608,9 @@ msgstr ""
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
#~ msgid "user name to use on server"
#~ msgstr "Benutzername für diesen Server"
#~ msgid "real name to use on server"
#~ msgstr "Realen Namen bei diesem Server nutzen"
+14 -6
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2229,7 +2229,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6555,11 +6555,13 @@ msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgstr "apodos para usar en el servidor (separados por comas)"
msgid "user name to use on server"
msgstr "nombre de usuario para usar en el servidor"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
msgid "real name to use on server"
msgstr "nombre real para usar en el servidor"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -10717,3 +10719,9 @@ msgstr "%s%s: no es posible configurar la opción \"nonblock\" para el socket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
#~ msgid "user name to use on server"
#~ msgstr "nombre de usuario para usar en el servidor"
#~ msgid "real name to use on server"
#~ msgstr "nombre real para usar en el servidor"
+17 -8
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"PO-Revision-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-28 14:58+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -2353,7 +2353,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -2394,7 +2394,7 @@ msgstr ""
" - les options weechat.startup.command_{before|after}_plugins\n"
" - les options de proxy: username, password\n"
" - les options de serveur irc: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - l'option relay.network.password\n"
" - la commande /eval.\n"
"\n"
@@ -6953,11 +6953,14 @@ msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
msgid "nicknames to use on server (separated by comma)"
msgstr "pseudos à utiliser sur le serveur (séparés par des virgules)"
msgid "user name to use on server"
msgstr "nom d'utilisateur pour le serveur"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nom d'utilisateur pour le serveur (note: le contenu est évalué, voir /help "
"eval)"
msgid "real name to use on server"
msgstr "nom réel pour le serveur"
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nom réel pour le serveur (note: le contenu est évalué, voir /help eval)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -11433,3 +11436,9 @@ msgstr ""
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
#~ msgid "user name to use on server"
#~ msgstr "nom d'utilisateur pour le serveur"
#~ msgid "real name to use on server"
#~ msgstr "nom réel pour le serveur"
+14 -8
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1867,7 +1867,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -5855,13 +5855,11 @@ msgstr "két újracsatlakozási próba közti szünet (másodpercben)"
msgid "nicknames to use on server (separated by comma)"
msgstr "felhasználónév az IRC szerveren"
#, fuzzy
msgid "user name to use on server"
msgstr "használni kívánt felhasználónév az IRC szerveren"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
#, fuzzy
msgid "real name to use on server"
msgstr "az IRC szerveren használt valódi név"
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
#, fuzzy
msgid ""
@@ -9860,3 +9858,11 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n"
#, fuzzy, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
#, fuzzy
#~ msgid "user name to use on server"
#~ msgstr "használni kívánt felhasználónév az IRC szerveren"
#, fuzzy
#~ msgid "real name to use on server"
#~ msgstr "az IRC szerveren használt valódi név"
+19 -6
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2247,6 +2247,7 @@ msgstr ""
"passphrase <chiave di cifratura>|-delete || decrypt <chiave di cifratura|-"
"discard || set <nome> <valore> || del <nome>"
#, fuzzy
msgid ""
"passphrase: change the passphrase (without passphrase, data is stored as "
"plain text in file sec.conf)\n"
@@ -2269,7 +2270,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6688,11 +6689,17 @@ msgstr "ritardo (in secondi) prima di riprovare a riconnettersi al server"
msgid "nicknames to use on server (separated by comma)"
msgstr "nick da usare sul server (separati da virgole)"
msgid "user name to use on server"
msgstr "nome utente da usare sul server"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nome utente per il server proxy (nota: il contenuto viene valutato, "
"consultare /help eval)"
msgid "real name to use on server"
msgstr "nome reale da usare sul server"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nome utente per il server proxy (nota: il contenuto viene valutato, "
"consultare /help eval)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -10871,3 +10878,9 @@ msgstr ""
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: timeout per \"%s\" con %s"
#~ msgid "user name to use on server"
#~ msgstr "nome utente da usare sul server"
#~ msgid "real name to use on server"
#~ msgstr "nome reale da usare sul server"
+19 -6
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -2269,6 +2269,7 @@ msgstr ""
"passphrase <passphrase>|-delete || decrypt <passphrase>|-discard || set "
"<name> <value> || del <name>"
#, fuzzy
msgid ""
"passphrase: change the passphrase (without passphrase, data is stored as "
"plain text in file sec.conf)\n"
@@ -2291,7 +2292,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6694,11 +6695,17 @@ msgstr "サーバへの再接続の際の遅延 (秒単位) 時間"
msgid "nicknames to use on server (separated by comma)"
msgstr "サーバで使用するニックネーム (コンマ区切り)"
msgid "user name to use on server"
msgstr "サーバで使用するユーザ名"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"プロキシサーバのユーザ名 (注意: 値は評価されます、/help eval を参照してくださ"
"い)"
msgid "real name to use on server"
msgstr "サーバで使用するリアルネーム"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"プロキシサーバのユーザ名 (注意: 値は評価されます、/help eval を参照してくださ"
"い)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -10940,3 +10947,9 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: \"%s\" のタイムアウト %s"
#~ msgid "user name to use on server"
#~ msgstr "サーバで使用するユーザ名"
#~ msgid "real name to use on server"
#~ msgstr "サーバで使用するリアルネーム"
+19 -6
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2321,6 +2321,7 @@ msgstr ""
"passphrase <hasło>|-delete || decrypt <hasło>|-discard || set <nazwa> "
"<wartość> || del <nazwa>"
#, fuzzy
msgid ""
"passphrase: change the passphrase (without passphrase, data is stored as "
"plain text in file sec.conf)\n"
@@ -2343,7 +2344,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6827,11 +6828,17 @@ msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgstr "lista nicków używanych na serwerze (oddzielone przecinkiem)"
msgid "user name to use on server"
msgstr "nazwa użytkownika używana na serwerze"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nazwa użytkownika dla serwera proxy (zawartość jest przetwarzana, zobacz /"
"help eval)"
msgid "real name to use on server"
msgstr "prawdziwa nazwa używana na serwerze"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"nazwa użytkownika dla serwera proxy (zawartość jest przetwarzana, zobacz /"
"help eval)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -11128,3 +11135,9 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda: błąd %d %s"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: przekroczono czas na \"%s\" z %s"
#~ msgid "user name to use on server"
#~ msgstr "nazwa użytkownika używana na serwerze"
#~ msgid "real name to use on server"
#~ msgstr "prawdziwa nazwa używana na serwerze"
+18 -6
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2181,7 +2181,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -6075,11 +6075,17 @@ msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgstr "apelidos para utilizar no servidor (separados por vírgula)"
msgid "user name to use on server"
msgstr "nome de usuário para utilizar no servidor"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
"(nota: conteúdo é avaliado, veja /help eval)"
msgid "real name to use on server"
msgstr "nome real para utilizar no servidor"
#, fuzzy
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
"(nota: conteúdo é avaliado, veja /help eval)"
msgid ""
"custom local hostname/IP for server (optional, if empty local hostname is "
@@ -10077,3 +10083,9 @@ msgstr "%s%s: não foi possível setar opção \"nonblock\" para o socket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: tempo esgotado para \"%s\" com %s"
#~ msgid "user name to use on server"
#~ msgstr "nome de usuário para utilizar no servidor"
#~ msgid "real name to use on server"
#~ msgstr "nome real para utilizar no servidor"
+14 -8
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-20 12:25+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1890,7 +1890,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -5879,13 +5879,11 @@ msgstr "задержка (в секундах) перед повторным с
msgid "nicknames to use on server (separated by comma)"
msgstr "ник, используемый на IRC сервере"
#, fuzzy
msgid "user name to use on server"
msgstr "имя пользователя, используемое на IRC сервере"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
#, fuzzy
msgid "real name to use on server"
msgstr "настоящее имя, используемое на IRC сервере"
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
#, fuzzy
msgid ""
@@ -9881,3 +9879,11 @@ msgstr "%s DCC: не могу установить неблокирующий р
#, fuzzy, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s нет аргумента для параметра \"%s\"\n"
#, fuzzy
#~ msgid "user name to use on server"
#~ msgstr "имя пользователя, используемое на IRC сервере"
#, fuzzy
#~ msgid "real name to use on server"
#~ msgstr "настоящее имя, используемое на IRC сервере"
+4 -4
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2014-02-16 11:21+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1685,7 +1685,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -5193,10 +5193,10 @@ msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgstr ""
msgid "user name to use on server"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
msgid "real name to use on server"
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
msgid ""
+4 -4
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-02-28 14:23+0100\n"
"POT-Creation-Date: 2014-02-28 14:57+0100\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1688,7 +1688,7 @@ msgid ""
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, sasl_{username|"
"password}\n"
"password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
@@ -5149,10 +5149,10 @@ msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgstr ""
msgid "user name to use on server"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
msgid "real name to use on server"
msgid "real name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
msgid ""
+1 -1
View File
@@ -7295,7 +7295,7 @@ command_init ()
" - options weechat.startup.command_{before|after}_plugins\n"
" - proxy options: username, password\n"
" - irc server options: autojoin, command, password, "
"sasl_{username|password}\n"
"sasl_{username|password}, username, realname\n"
" - option relay.network.password\n"
" - command /eval.\n"
"\n"
+4 -2
View File
@@ -1742,7 +1742,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
new_option = weechat_config_new_option (
config_file, section,
option_name, "string",
N_("user name to use on server"),
N_("user name to use on server "
"(note: content is evaluated, see /help eval)"),
NULL, 0, 0,
default_value, value,
null_value_allowed,
@@ -1754,7 +1755,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
new_option = weechat_config_new_option (
config_file, section,
option_name, "string",
N_("real name to use on server"),
N_("real name to use on server "
"(note: content is evaluated, see /help eval)"),
NULL, 0, 0,
default_value, value,
null_value_allowed,
+25 -13
View File
@@ -332,7 +332,7 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server,
char *
irc_ctcp_replace_variables (struct t_irc_server *server, const char *format)
{
char *res, *temp;
char *res, *temp, *username, *realname;
const char *info;
time_t now;
struct tm *local_time;
@@ -463,23 +463,35 @@ irc_ctcp_replace_variables (struct t_irc_server *server, const char *format)
* $username: user name, example:
* name
*/
temp = weechat_string_replace (res, "$username",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME));
free (res);
if (!temp)
return NULL;
res = temp;
username = weechat_string_eval_expression (
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME),
NULL, NULL, NULL);
if (username)
{
temp = weechat_string_replace (res, "$username", username);
free (res);
if (!temp)
return NULL;
res = temp;
free (username);
}
/*
* $realname: real name, example:
* John doe
*/
temp = weechat_string_replace (res, "$realname",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME));
free (res);
if (!temp)
return NULL;
res = temp;
realname = weechat_string_eval_expression (
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME),
NULL, NULL, NULL);
if (realname)
{
temp = weechat_string_replace (res, "$realname", realname);
free (res);
if (!temp)
return NULL;
res = temp;
free (realname);
}
/* return result */
return res;
+19 -10
View File
@@ -3110,22 +3110,24 @@ irc_server_reconnect_schedule (struct t_irc_server *server)
void
irc_server_login (struct t_irc_server *server)
{
const char *username, *realname, *capabilities;
char *password, *username2;
const char *capabilities;
char *password, *username, *realname, *username2;
password = weechat_string_eval_expression (
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PASSWORD),
NULL, NULL, NULL);
username = weechat_string_eval_expression (
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME),
NULL, NULL, NULL);
realname = weechat_string_eval_expression (
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME),
NULL, NULL, NULL);
password = weechat_string_eval_expression (IRC_SERVER_OPTION_STRING(server,
IRC_SERVER_OPTION_PASSWORD),
NULL, NULL, NULL);
username = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME);
realname = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME);
capabilities = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES);
if (password && password[0])
irc_server_sendf (server, 0, NULL, "PASS %s", password);
if (password)
free (password);
if (!server->nick)
{
irc_server_set_nick (server,
@@ -3161,6 +3163,13 @@ irc_server_login (struct t_irc_server *server)
0, 1,
&irc_server_timer_connection_cb,
server);
if (password)
free (password);
if (username)
free (username);
if (realname)
free (realname);
}
/*