foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irc: hide passwords in commands or messages sent to nickserv with modifiers (bug #38346) 

New modifiers: "irc_command_auth" and "irc_message_auth".
Option removed: irc.look.hide_nickserv_pwd
New option: irc.look.nicks_hide_password
v2.8-utf8proc
Sebastien Helleu 2013-02-23 14:54:07 +01:00
parent c17d3e155c
commit 9beb263e4a
31 changed files with 990 additions and 953 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -32,6 +32,10 @@ Version 0.4.1 (under dev!)
list with arguments inside), guile >= 2.0 is now required (bug #38350)
* guile: fix crash on calls to callbacks during load of script (bug #38343)
* guile: fix compilation with guile 2.0
* irc: hide passwords in commands or messages sent to nickserv (/msg nickserv)
with new modifiers "irc_command_auth" and "irc_message_auth", remove option
irc.look.hide_nickserv_pwd, add option irc.look.nicks_hide_password
(bug #38346)
* irc: fix display of malformed CTCP (without closing char) (bug #38347)
* irc: unmask smart filtered join if nick speaks in channel some minutes after
the join, new option irc.look.smart_filter_join_unmask (task #12405)

52
NEWS
View File

@ -1,7 +1,7 @@
WeeChat Release Notes
=====================
Sébastien Helleu <flashcode@flashtux.org>
v0.4.1-dev, 2013-02-20
v0.4.1-dev, 2013-02-23
This document lists important changes for each version, that sometimes require
@ -14,6 +14,33 @@ For a complete list of changes, please look at file 'ChangeLog'.
Version 0.4.1 (under dev!)
--------------------------
=== IRC passwords hidden ===
IRC plugin is now using modifiers "irc_command_auth" and "irc_message_auth" to
hide passwords.
The option 'irc.look.hide_nickserv_pwd' has been removed, and a new option
'irc.look.nicks_hide_password' has been added (by default passwords are hidden
only for "nickserv").
A new rmodifier "message_auth" has been added to hide passwords displayed by
command "/msg nickserv identify|register|ghost|release" and the rmodifier
"nickserv" has been renamed to "command_auth".
If you never added/changed rmodifiers, you can just reset all rmodifiers:
----------------------------------------
/rmodifier default -yes
----------------------------------------
If you added/changed some rmodifiers, do it manually with these commands:
----------------------------------------
/rmodifier del nickserv
/rmodifier add command_auth history_add,input_text_display,irc_command_auth 1,4* ^(/(msg|quote) +nickserv +(id|identify|register|ghost \S+|release \S+) +)(.*)
/rmodifier add message_auth irc_message_auth 1,3* ^(.*(id|identify|register|ghost \S+|release \S+) +)(.*)
----------------------------------------
=== Guile callbacks ===
The way to give arguments for guile callbacks has been fixed: now arguments are
@ -38,17 +65,17 @@ about bars in the 'WeeChat User's guide').
==== IRC ====
IPv6 is now used by default to connect to IRC servers, with fallback to
IPv4. The option irc.server_default.ipv6 is now "on" by default. If IPv6 is not
enabled or fails, IPv4 will be used. The "ipv6" option in server is now used to
disable IPv6 and force IPv4 (if option is turned "off").
IPv4. The option 'irc.server_default.ipv6' is now "on" by default. If IPv6 is
not enabled or fails, IPv4 will be used. The "ipv6" option in server is now used
to disable IPv6 and force IPv4 (if option is turned "off").
==== Relay ====
Relay plugin is now listening by default on an IPv6 socket (new option
relay.network.ipv6, on by default), so connections with IPv4 will have
'relay.network.ipv6', on by default), so connections with IPv4 will have
IPv4-mapped IPv6 addresses, like: "::ffff:127.0.0.1" (for "127.0.0.1"); check
that value of option relay.network.allowed_ips supports this mapping, or disable
IPv6 in relay if you don't plan to use it at all:
that value of option 'relay.network.allowed_ips' supports this mapping, or
disable IPv6 in relay if you don't plan to use it at all:
----------------------------------------
/set relay.network.ipv6 off
@ -142,10 +169,15 @@ disable paste detection: if your value was 0, you should set it to -1
=== Rmodifier ===
Rmodifier "nickserv" has a new default regex which includes option "release" for
command "/msg nickserv". If you never added/changed rmodifiers, you can just
reset all rmodifiers (command: `/rmodifier default -yes`).
command "/msg nickserv".
If you added/changed some rmodifiers, do it manually with these two commands:
If you never added/changed rmodifiers, you can just reset all rmodifiers:
----------------------------------------
/rmodifier default -yes
----------------------------------------
If you added/changed some rmodifiers, do it manually with these commands:
----------------------------------------
/rmodifier del nickserv

10
doc/de/autogen/user/irc_options.txt
View File

@ -158,11 +158,6 @@
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
** Beschreibung: `Passwörter verstecken die durch NickServ angezeigt werden`
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
* [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
** Beschreibung: `durch Kommata getrennte Liste von Wörtern die im Channel-Buffer als Highlight erscheinen sollen (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden; des weiteren können folgende Variablen genutzt werden: $nick, $channel und $server). Die angegeben Wörter werden der lokalen Variable "highlight_words" hinzugefügt, sobald der Buffer geöffnet wird. Dies bedeutet, dass diese Option keinen direkten Einfluss auf schon geöffnete Buffer hat. Eine leere Zeichenkette deaktiviert ein Highlight für den Nick. Beispiel: "$nick", "(?-i)$nick"`
** Typ: Zeichenkette
@ -258,6 +253,11 @@
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
** Beschreibung: `comma separated list of nicks for which passwords will be hidden when a message is sent, for example to hide password in message displayed by "/msg nickserv identify password", example: "nickserv,nickbot"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"nickserv"`)
* [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
** Beschreibung: `zeigt Notizen als private Nachricht an (wird die "auto" Option verwendet dann wird ein privater Buffer genutzt, falls vorhanden)`
** Typ: integer

10
doc/en/autogen/user/irc_options.txt
View File

@ -158,11 +158,6 @@
** type: boolean
** values: on, off (default value: `on`)
* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
** description: `hide password displayed by nickserv`
** type: boolean
** values: on, off (default value: `on`)
* [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
** description: `comma separated list of words to highlight in channel buffers (case insensitive, use "(?-i)" at beginning of words to make them case sensitive; special variables $nick, $channel and $server are replaced by their value), these words are added to buffer local variable "highlight_words" only when buffer is created (it does not affect current buffers), an empty string disables default highlight on nick, examples: "$nick", "(?-i)$nick"`
** type: string
@ -258,6 +253,11 @@
** type: string
** values: any string (default value: `""`)
* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
** description: `comma separated list of nicks for which passwords will be hidden when a message is sent, for example to hide password in message displayed by "/msg nickserv identify password", example: "nickserv,nickbot"`
** type: string
** values: any string (default value: `"nickserv"`)
* [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
** description: `display notices as private messages (if auto, use private buffer if found)`
** type: integer

1
doc/en/weechat_dev.en.txt
View File

@ -194,7 +194,6 @@ Plugins
| irc-config.c | IRC config options
| irc-ctcp.c | IRC CTCP
| irc-debug.c | IRC debug functions
| irc-display.c | IRC display functions
| irc-ignore.c | IRC Ignore
| irc-info.c | IRC info/infolists/hdata
| irc-input.c | Input of commands/text

12
doc/en/weechat_plugin_api.en.txt
View File

@ -8850,6 +8850,18 @@ Arguments:
any string |
string with IRC color codes, or without color
| irc | irc_command_auth +
(_new in version 0.4.1_) |
server name |
authentication command (for example: `/msg nickserv identify password`) |
command with hidden password (for example: `/msg nickserv identify ********`)
| irc | irc_message_auth +
(_new in version 0.4.1_) |
server name |
message displayed after `/msg` sent to nickserv |
message with hidden password
| irc | irc_in_xxx ^(1)^ |
server name |
content of message received from IRC server (before charset decoding) |

10
doc/fr/autogen/user/irc_options.txt
View File

@ -158,11 +158,6 @@
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
** description: `masquer le mot de passe affiché par nickserv`
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
** description: `liste de mots pour le highlight dans les tampons de type "canal", séparés par des virgules (insensible à la casse, utilisez "(?-i)" au début des mots pour les rendre sensibles à la casse; les variables spéciales $nick, $channel et $server sont remplacées par leurs valeurs), ces mots sont ajoutés à la variable locale du tampon "highlight_words" seulement lorsque le tampon est créé (cela n'affecte pas les tampons courants), une chaîne vide désactive le highlight par défaut sur le pseudo, exemples: "$nick", "(?-i)$nick"`
** type: chaîne
@ -258,6 +253,11 @@
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
** description: `liste des pseudos (séparés par des virgules) pour lesquels les mots de passe seront masqués quand un message est envoyé, par exemple pour cacher le mot de passe dans le message affiché par "/msg nickserv identify motedepasse", exemple: "nickserv|nickbot"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"nickserv"`)
* [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
** description: `afficher les notices comme des messages privés (si auto, utilise le tampon privé s'il est trouvé)`
** type: entier

12
doc/fr/weechat_plugin_api.fr.txt
View File

@ -8989,6 +8989,18 @@ Paramètres :
toute chaîne |
chaîne avec des codes couleur IRC, ou sans couleur
| irc | irc_command_auth +
(_nouveau dans la version 0.4.1_) |
nom du serveur |
commande d'authentification (par exemple: `/msg nickserv identify password`) |
commande avec le mot de passe caché (par exemple: `/msg nickserv identify ********`)
| irc | irc_message_auth +
(_nouveau dans la version 0.4.1_) |
nom du serveur |
message affiché après `msg` envoyé à nickserv |
message avec le mot de passe caché
| irc | irc_in_xxx ^(1)^ |
nom de serveur |
contenu du message reçu du serveur IRC (avant décodage du jeu de caractères) |

10
doc/it/autogen/user/irc_options.txt
View File

@ -158,11 +158,6 @@
** tipo: bool
** valori: on, off (valore predefinito: `on`)
* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
** descrizione: `nascondi password visualizzata da nickserv`
** tipo: bool
** valori: on, off (valore predefinito: `on`)
* [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
** descrizione: `elenco separato da virgole di parole da notificare nei buffer dei canali (non sensibili alle maiuscole, usare "(?-i)" all'inizio delle parole per renderle sensibili alle maiuscole; le variabili speciali $nick, $channel e $server sono sostituite dal loro valore), queste parole vengono aggiunte alla variabile locale del buffer "highlight_words" solo quando viene creato il buffer (non interessa gli attuali buffer), una stringa vuota disabilita la notifica predefinita sul nick, esempi: "$nick", "(?-i)$nick"`
** tipo: stringa
@ -258,6 +253,11 @@
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
** descrizione: `comma separated list of nicks for which passwords will be hidden when a message is sent, for example to hide password in message displayed by "/msg nickserv identify password", example: "nickserv,nickbot"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"nickserv"`)
* [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
** descrizione: `visualizza notifiche come messaggi privati (se automatico, usa il buffer privato se viene trovato)`
** tipo: intero

14
doc/it/weechat_plugin_api.it.txt
View File

@ -8954,6 +8954,20 @@ Argomenti:
qualsiasi stringa |
stringa con i codici colori IRC, o senza colore
// TRANSLATION MISSING
| irc | irc_command_auth +
(_novità nella versione 0.4.1_) |
nome server |
authentication command (for example: `/msg nickserv identify password`) |
command with hidden password (for example: `/msg nickserv identify ********`)
// TRANSLATION MISSING
| irc | irc_message_auth +
(_novità nella versione 0.4.1_) |
nome server |
message displayed after `/msg` sent to nickserv |
message with hidden password
| irc | irc_in_xxx ^(1)^ |
nome server |
contenuto del messaggio ricevuto dal server IRC (prima della codifica del set caratteri) |

10
doc/ja/autogen/user/irc_options.txt
View File

@ -158,11 +158,6 @@
** タイプ: ブール
** 値: on, off (デフォルト値: `on`)
* [[option_irc.look.hide_nickserv_pwd]] *irc.look.hide_nickserv_pwd*
** 説明: `nickserv が表示するパスワードを隠す`
** タイプ: ブール
** 値: on, off (デフォルト値: `on`)
* [[option_irc.look.highlight_channel]] *irc.look.highlight_channel*
** 説明: `現在のバッファでハイライトする単語のコンマ区切りリスト (大文字小文字を区別しない、"(?-i)" を単語の最初につければ大文字小文字を区別する; 特殊変数 $nick、$channel、$server はそれぞれの値に置換される)、これらの単語は、バッファの作成時にバッファのローカル変数 "highlight_words" に追加される (既存のバッファには影響なし)、空文字列はニックネームに関するデフォルトのハイライトを無効にする、例: "$nick", "(?-i)$nick"`
** タイプ: 文字列
@ -258,6 +253,11 @@
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_irc.look.nicks_hide_password]] *irc.look.nicks_hide_password*
** 説明: `comma separated list of nicks for which passwords will be hidden when a message is sent, for example to hide password in message displayed by "/msg nickserv identify password", example: "nickserv,nickbot"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"nickserv"`)
* [[option_irc.look.notice_as_pv]] *irc.look.notice_as_pv*
** 説明: `notice をプライベートメッセージとして表示 (auto の場合、プライベートバッファが見つかればそれを使用する)`
** タイプ: 整数

2
po/POTFILES.in
View File

@ -138,8 +138,6 @@
./src/plugins/irc/irc-ctcp.h
./src/plugins/irc/irc-debug.c
./src/plugins/irc/irc-debug.h
./src/plugins/irc/irc-display.c
./src/plugins/irc/irc-display.h
./src/plugins/irc/irc.h
./src/plugins/irc/irc-ignore.c
./src/plugins/irc/irc-ignore.h

75
po/cs.po
View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:54+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Czech\n"
@ -4349,6 +4349,37 @@ msgstr "%s%s: notifikace nenalezena"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: nemohu vytvořít nový soukromý buffer\"%s\""
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%sServer: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "připojen"
msgid "not connected"
msgstr "nepřipojen"
msgid " (temporary)"
msgstr " (dočasný)"
msgid "on"
msgstr "na"
msgid "off"
msgstr "off"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
msgstr[1] "minuty"
msgstr[2] "minut"
msgid "channel"
msgid_plural "channels"
msgstr[0] "kanál"
msgstr[1] "kanály"
msgstr[2] "kanálů"
msgid "All servers:"
msgstr "Všechny servery:"
@ -5968,9 +5999,6 @@ msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "zobrazovat předponu přezdívky v položce pole \"input_prompt\""
msgid "hide password displayed by nickserv"
msgstr "schovat heslo zobrazené nickservem"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6018,6 +6046,12 @@ msgstr ""
"výchozí cílový buffer pro volby msgbuffer, když je cíl soukromý a příslušný "
"soukromý buffer není nalezen"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6257,37 +6291,6 @@ msgstr "%s%s: neznámý DCC CHAT typ obdržen od %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNeznámý CTCP požadavek od %s%s%s: %s%s%s%s%s"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%sServer: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "připojen"
msgid "not connected"
msgstr "nepřipojen"
msgid " (temporary)"
msgstr " (dočasný)"
msgid "on"
msgstr "na"
msgid "off"
msgstr "off"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
msgstr[1] "minuty"
msgstr[2] "minut"
msgid "channel"
msgid_plural "channels"
msgstr[0] "kanál"
msgstr[1] "kanály"
msgstr[2] "kanálů"
#, fuzzy
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 pokud je řetězec validní jméno IRC kanálu"

71
po/de.po
View File

@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
"Language: \n"
@ -4847,6 +4847,35 @@ msgstr "%s%s: Benachrichtigung nicht gefunden"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: ein neuer privater Buffer \"%s\" kann nicht erstellt werden"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "verbunden"
msgid "not connected"
msgstr "nicht verbunden"
msgid " (temporary)"
msgstr " (temporär)"
msgid "on"
msgstr "an"
msgid "off"
msgstr "aus"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "Minute"
msgstr[1] "Minuten"
msgid "channel"
msgid_plural "channels"
msgstr[0] "Channel"
msgstr[1] "Channels"
msgid "All servers:"
msgstr "Alle Server:"
@ -6560,9 +6589,6 @@ msgstr "zeigt Nick-Modi in \"input_prompt\" Bar-Item"
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "der Nick-Präfix wird in \"input_prompt\" Bar-Item angezeigt"
msgid "hide password displayed by nickserv"
msgstr "Passwörter verstecken die durch NickServ angezeigt werden"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6639,6 +6665,12 @@ msgstr ""
"Standardbuffer der für Ausgaben genutzt werden soll, falls ein privater "
"Buffer nicht gefunden wird"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6924,35 +6956,6 @@ msgstr "%s%s: unbekannter DCC CHAT-Typ empfangen von %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sunbekannte CTCP Anfrage von %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "verbunden"
msgid "not connected"
msgstr "nicht verbunden"
msgid " (temporary)"
msgstr " (temporär)"
msgid "on"
msgstr "an"
msgid "off"
msgstr "aus"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "Minute"
msgstr[1] "Minuten"
msgid "channel"
msgid_plural "channels"
msgstr[0] "Channel"
msgstr[1] "Channels"
msgid "1 if string is a valid IRC channel name for server"
msgstr ""
"1, falls die Zeichenkette ein gültiger IRC-Channelname für den Server ist"

71
po/es.po
View File

@ -22,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Spanish\n"
@ -4548,6 +4548,35 @@ msgstr "%s%s: notificación no encontrada"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: no es posible crear la conversación privada \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "conectado"
msgid "not connected"
msgstr "no conectado"
msgid " (temporary)"
msgstr " (temporal)"
msgid "on"
msgstr "activo"
msgid "off"
msgstr "inactivo"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canales"
msgid "All servers:"
msgstr "Todos los servidores:"
@ -6188,9 +6217,6 @@ msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "mostrar el prefijo del apodo en el elemento de barra \"input_prompt\""
msgid "hide password displayed by nickserv"
msgstr "ocultar contraseña mostrada por nickserv"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6262,6 +6288,12 @@ msgstr ""
"buffer destino por defecto para las opciones msgbuffer cuando el destino es "
"privado y no hay un buffer privado disponible"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6515,35 +6547,6 @@ msgstr "%s%s: tipo de DCC CHAT desconocido recibido de %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP desconocido solicitado por %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "conectado"
msgid "not connected"
msgstr "no conectado"
msgid " (temporary)"
msgstr " (temporal)"
msgid "on"
msgstr "activo"
msgid "off"
msgstr "inactivo"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canales"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 si la cadena es un nombre de canal IRC válido para el servidor"

75
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-23 08:23+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 12:50+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -4712,6 +4712,35 @@ msgstr "%s%s: notification non trouvée"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: impossible de créer le tampon privé \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Serveur: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "connecté"
msgid "not connected"
msgstr "non connecté"
msgid " (temporary)"
msgstr " (temporaire)"
msgid "on"
msgstr "activé"
msgid "off"
msgstr "désactivé"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canaux"
msgid "All servers:"
msgstr "Tous les serveurs:"
@ -6378,9 +6407,6 @@ msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "affiche le préfixe du pseudo dans l'objet de barre \"input_prompt\""
msgid "hide password displayed by nickserv"
msgstr "masquer le mot de passe affiché par nickserv"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6455,6 +6481,16 @@ msgstr ""
"tampon cible par défaut pour les options msgbuffer quand la cible est "
"\"private\" et que le tampon privé n'est pas trouvé"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
"liste des pseudos (séparés par des virgules) pour lesquels les mots de passe "
"seront masqués quand un message est envoyé, par exemple pour cacher le mot "
"de passe dans le message affiché par \"/msg nickserv identify motedepasse\", "
"exemple: \"nickserv|nickbot\""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6726,35 +6762,6 @@ msgstr "%s%s: type de DCC CHAT inconnu reçu de %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP inconnu demandé par %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Serveur: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "connecté"
msgid "not connected"
msgstr "non connecté"
msgid " (temporary)"
msgstr " (temporaire)"
msgid "on"
msgstr "activé"
msgid "off"
msgstr "désactivé"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canaux"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 si la chaîne est un nom de canal IRC valide pour le serveur"

75
po/hu.po
View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Hungarian\n"
@ -3952,6 +3952,37 @@ msgstr "aláírás nem található"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
msgid "connected"
msgstr "csatlakozva"
msgid "not connected"
msgstr "nincs csatlakozva"
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr "be"
msgid "off"
msgstr "ki"
#, fuzzy
msgid "minute"
msgid_plural "minutes"
msgstr[0] "perc"
msgstr[1] "perc"
#, fuzzy
msgid "channel"
msgid_plural "channels"
msgstr[0] "%d szoba"
msgstr[1] "%d szoba"
#, fuzzy
msgid "All servers:"
msgstr "Minden szerver:\n"
@ -5522,9 +5553,6 @@ msgstr ""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr ""
msgid "hide password displayed by nickserv"
msgstr "a nickserv által mutatott jelszó elrejtése"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -5568,6 +5596,12 @@ msgid ""
"private buffer is not found"
msgstr ""
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
#, fuzzy
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
@ -5791,37 +5825,6 @@ msgstr "%s usmeretlen DCC CHAT típus érkezett a következőtől:"
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
msgid "connected"
msgstr "csatlakozva"
msgid "not connected"
msgstr "nincs csatlakozva"
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr "be"
msgid "off"
msgstr "ki"
#, fuzzy
msgid "minute"
msgid_plural "minutes"
msgstr[0] "perc"
msgstr[1] "perc"
#, fuzzy
msgid "channel"
msgid_plural "channels"
msgstr[0] "%d szoba"
msgstr[1] "%d szoba"
#, fuzzy
msgid "1 if string is a valid IRC channel name for server"
msgstr "felhasználók listája a szobában"

71
po/it.po
View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Italian\n"
@ -4561,6 +4561,35 @@ msgstr "%s%s: notifica non trovata"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: impossibile creare il nuovo buffer privato \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "connesso"
msgid "not connected"
msgstr "non connesso"
msgid " (temporary)"
msgstr " (temporaneo)"
msgid "on"
msgstr "attivo"
msgid "off"
msgstr "non attivo"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minuti"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canale"
msgstr[1] "canali"
msgid "All servers:"
msgstr "Tutti i server:"
@ -6197,9 +6226,6 @@ msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "visualizza il prefisso del nick nell'elemento barra \"input_prompt\""
msgid "hide password displayed by nickserv"
msgstr "nascondi password visualizzata da nickserv"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6274,6 +6300,12 @@ msgstr ""
"buffer di destinazione predefinito per le opzioni di msgbuffer quando la "
"destinazione è privata ed il buffer privato non viene trovato"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6537,35 +6569,6 @@ msgstr "%s%s: tipo di DCC CHAT sconosciuto ricevuto da %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP sconosciuto richiesto da %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "connesso"
msgid "not connected"
msgstr "non connesso"
msgid " (temporary)"
msgstr " (temporaneo)"
msgid "on"
msgstr "attivo"
msgid "off"
msgstr "non attivo"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minuti"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canale"
msgstr[1] "canali"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 se la stringa è il nome di un canale IRC valido per il server"

67
po/ja.po
View File

@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
"Language: ja\n"
@ -4536,6 +4536,33 @@ msgstr "%s%s: 通知が見つかりません"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: 新しいプライベートバッファ \"%s\" の作成に失敗"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "サーバ: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "接続済み"
msgid "not connected"
msgstr "未接続"
msgid " (temporary)"
msgstr " (一時的)"
msgid "on"
msgstr "オン"
msgid "off"
msgstr "オフ"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分"
msgid "channel"
msgid_plural "channels"
msgstr[0] "チャンネル"
msgid "All servers:"
msgstr "全てのサーバ:"
@ -6159,9 +6186,6 @@ msgstr "\"input_prompt\" バーアイテムではニックネームモードを
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "\"input_prompt\" バーアイテムではニックネームプレフィックスを表示"
msgid "hide password displayed by nickserv"
msgstr "nickserv が表示するパスワードを隠す"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6227,6 +6251,12 @@ msgstr ""
"ターゲットがプライベートでプライベートバッファが見つからない場合の msgbuffer "
"オプション用のデフォルトのターゲットバッファ"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6478,33 +6508,6 @@ msgstr "%s%s: %s%s%s からの未知の DCC CHAT タイプ: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s からの未知の CTCP 要求: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "サーバ: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "接続済み"
msgid "not connected"
msgstr "未接続"
msgid " (temporary)"
msgstr " (一時的)"
msgid "on"
msgstr "オン"
msgid "off"
msgstr "オフ"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分"
msgid "channel"
msgid_plural "channels"
msgstr[0] "チャンネル"
msgid "1 if string is a valid IRC channel name for server"
msgstr "文字列がサーバの有効な IRC チャンネル名なら 1"

75
po/pl.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:11+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Polish\n"
@ -4635,6 +4635,37 @@ msgstr "%s%s: nie znaleziono powiadomienia"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: nie można utworzyć nowego bufora prywatnego \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Serwer: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "połączony"
msgid "not connected"
msgstr "nie połączony"
msgid " (temporary)"
msgstr " (tymczasowy)"
msgid "on"
msgstr "włączone"
msgid "off"
msgstr "wyłączone"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutę"
msgstr[1] "minuty"
msgstr[2] "minut"
msgid "channel"
msgid_plural "channels"
msgstr[0] "kanał"
msgstr[1] "kanały"
msgstr[2] "kanałów"
msgid "All servers:"
msgstr "Wszystkie serwery:"
@ -6279,9 +6310,6 @@ msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr "wyświetl przedrostek nicka w elemencie paska \"input_prompt\""
msgid "hide password displayed by nickserv"
msgstr "ukryj hasło wyświetlane przez nickserv"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -6351,6 +6379,12 @@ msgstr ""
"domyślny bufor docelowy dla bufora wiadomości, kiedy cel jest prywatny i nie "
"odnaleziono tego prywatnego bufora"
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -6612,37 +6646,6 @@ msgstr "%s%s: nieznany typ DCC CHAT otrzymano od %s%s%s: \"%s\""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNieznane zażądane CTCP przez %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Serwer: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "połączony"
msgid "not connected"
msgstr "nie połączony"
msgid " (temporary)"
msgstr " (tymczasowy)"
msgid "on"
msgstr "włączone"
msgid "off"
msgstr "wyłączone"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutę"
msgstr[1] "minuty"
msgstr[2] "minut"
msgid "channel"
msgid_plural "channels"
msgstr[0] "kanał"
msgstr[1] "kanały"
msgstr[2] "kanałów"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 jeśli ciąg jest poprawną nazwą kanału IRC dla serwera"

71
po/pt_BR.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Portuguese\n"
@ -4377,6 +4377,35 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "conectado"
msgid "not connected"
msgstr "não conectado"
msgid " (temporary)"
msgstr " (temporário)"
msgid "on"
msgstr "ligado"
msgid "off"
msgstr "desligado"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canais"
msgid "All servers:"
msgstr ""
@ -5700,9 +5729,6 @@ msgstr ""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr ""
msgid "hide password displayed by nickserv"
msgstr "ocultar senha exibida pelo nickserv"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -5746,6 +5772,12 @@ msgid ""
"private buffer is not found"
msgstr ""
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -5965,35 +5997,6 @@ msgstr ""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sRequisição CTCP desconhecida por %s%s%s: %s%s%s%s%s"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"
msgstr "conectado"
msgid "not connected"
msgstr "não conectado"
msgid " (temporary)"
msgstr " (temporário)"
msgid "on"
msgstr "ligado"
msgid "off"
msgstr "desligado"
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
msgid "channel"
msgid_plural "channels"
msgstr[0] "canal"
msgstr[1] "canais"
msgid "1 if string is a valid IRC channel name for server"
msgstr "1 se string é um nome de canal IRC válido para o servidor"

79
po/ru.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2013-02-23 08:23+0100\n"
"PO-Revision-Date: 2013-02-21 17:55+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+0100\n"
"PO-Revision-Date: 2013-02-23 11:12+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: Russian\n"
@ -3985,6 +3985,39 @@ msgstr "подпись не найдена"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s невозможно создать новый буфер привата \"%s\"\n"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
msgid "connected"
msgstr "подключен"
msgid "not connected"
msgstr "отключен"
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr "вкл."
msgid "off"
msgstr "выкл."
#, fuzzy
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
msgstr[1] "минута"
msgstr[2] "минута"
#, fuzzy
msgid "channel"
msgid_plural "channels"
msgstr[0] "%d канал"
msgstr[1] "%d каналов"
msgstr[2] "%d каналов"
#, fuzzy
msgid "All servers:"
msgstr "Все серверы:\n"
@ -5541,9 +5574,6 @@ msgstr ""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr ""
msgid "hide password displayed by nickserv"
msgstr "скрывать пароль, отображаемый nickserv'ом"
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -5587,6 +5617,12 @@ msgid ""
"private buffer is not found"
msgstr ""
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
#, fuzzy
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
@ -5815,39 +5851,6 @@ msgstr "%s неизвестный режим DCC CHAT получен от "
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
msgid "connected"
msgstr "подключен"
msgid "not connected"
msgstr "отключен"
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr "вкл."
msgid "off"
msgstr "выкл."
#, fuzzy
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
msgstr[1] "минута"
msgstr[2] "минута"
#, fuzzy
msgid "channel"
msgid_plural "channels"
msgstr[0] "%d канал"
msgstr[1] "%d каналов"
msgstr[2] "%d каналов"
#, fuzzy
msgid "1 if string is a valid IRC channel name for server"
msgstr "список ников на канале"

2
po/srcfiles.cmake
View File

@ -135,8 +135,6 @@ SET(WEECHAT_SOURCES
./src/plugins/irc/irc-ctcp.h
./src/plugins/irc/irc-debug.c
./src/plugins/irc/irc-debug.h
./src/plugins/irc/irc-display.c
./src/plugins/irc/irc-display.h
./src/plugins/irc/irc.h
./src/plugins/irc/irc-ignore.c
./src/plugins/irc/irc-ignore.h

69
po/weechat.pot
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: 2013-02-23 08:23+0100\n"
"POT-Creation-Date: 2013-02-23 12:49+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"
@ -3554,6 +3554,35 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr ""
msgid "connected"
msgstr ""
msgid "not connected"
msgstr ""
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr ""
msgid "off"
msgstr ""
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
msgid "channel"
msgid_plural "channels"
msgstr[0] ""
msgstr[1] ""
msgid "All servers:"
msgstr ""
@ -4801,9 +4830,6 @@ msgstr ""
msgid "display nick prefix in \"input_prompt\" bar item"
msgstr ""
msgid "hide password displayed by nickserv"
msgstr ""
msgid ""
"comma separated list of words to highlight in server buffers (case "
"insensitive, use \"(?-i)\" at beginning of words to make them case "
@ -4847,6 +4873,12 @@ msgid ""
"private buffer is not found"
msgstr ""
msgid ""
"comma separated list of nicks for which passwords will be hidden when a "
"message is sent, for example to hide password in message displayed by \"/msg "
"nickserv identify password\", example: \"nickserv,nickbot\""
msgstr ""
msgid ""
"display notices as private messages (if auto, use private buffer if found)"
msgstr ""
@ -5050,35 +5082,6 @@ msgstr ""
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr ""
msgid "connected"
msgstr ""
msgid "not connected"
msgstr ""
msgid " (temporary)"
msgstr ""
msgid "on"
msgstr ""
msgid "off"
msgstr ""
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
msgid "channel"
msgid_plural "channels"
msgstr[0] ""
msgstr[1] ""
msgid "1 if string is a valid IRC channel name for server"
msgstr ""

1
src/plugins/irc/CMakeLists.txt
View File

@ -28,7 +28,6 @@ irc-completion.c irc-completion.h
irc-config.c irc-config.h
irc-ctcp.c irc-ctcp.h
irc-debug.c irc-debug.h
irc-display.c irc-display.h
irc-ignore.c irc-ignore.h
irc-info.c irc-info.h
irc-input.c irc-input.h

2
src/plugins/irc/Makefile.am
View File

@ -43,8 +43,6 @@ irc_la_SOURCES = irc.c \
irc-ctcp.h \
irc-debug.c \
irc-debug.h \
irc-display.c \
irc-display.h \
irc-ignore.c \
irc-ignore.h \
irc-info.c \

423
src/plugins/irc/irc-command.c
View File

@ -37,7 +37,6 @@
#include "irc-channel.h"
#include "irc-color.h"
#include "irc-config.h"
#include "irc-display.h"
#include "irc-ignore.h"
#include "irc-input.h"
#include "irc-msgbuffer.h"
@ -45,6 +44,7 @@
#include "irc-notify.h"
#include "irc-protocol.h"
#include "irc-raw.h"
#include "irc-sasl.h"
#include "irc-server.h"
@ -418,6 +418,35 @@ irc_command_me_all_channels (struct t_irc_server *server, const char *arguments)
}
}
/*
* Displays away on all channels of all servers.
*/
void
irc_command_display_away (struct t_irc_server *server, const char *string1,
const char *string2)
{
struct t_irc_channel *ptr_channel;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
{
weechat_printf_tags (ptr_channel->buffer,
"away_info",
"%s[%s%s%s %s: %s%s]",
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
IRC_COLOR_RESET,
string1,
string2,
IRC_COLOR_CHAT_DELIMITERS);
}
}
}
/*
* Toggles away status for one server.
*/
@ -451,8 +480,10 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
string = irc_color_decode (arguments,
weechat_config_boolean (irc_config_network_colors_receive));
if (weechat_config_integer (irc_config_look_display_away) == IRC_CONFIG_DISPLAY_AWAY_LOCAL)
irc_display_away (server, "away",
(string) ? string : arguments);
{
irc_command_display_away (server, "away",
(string) ? string : arguments);
}
else
{
snprintf (buffer, sizeof (buffer), "is away: %s",
@ -525,7 +556,7 @@ irc_command_away_server (struct t_irc_server *server, const char *arguments,
(long int)(elapsed / 3600),
(long int)((elapsed / 60) % 60),
(long int)(elapsed % 60));
irc_display_away (server, "back", buffer);
irc_command_display_away (server, "back", buffer);
}
else
{
@ -2634,7 +2665,8 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
char **argv, char **argv_eol)
{
char **targets;
int num_targets, i, arg_target, arg_text, is_channel, msg_op_voice;
int num_targets, i, j, arg_target, arg_text, is_channel, msg_op_voice;
int hide_password;
char *msg_pwd_hidden;
char *string;
@ -2752,13 +2784,26 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
}
else
{
/* message to nickserv with identify ? */
if (weechat_strcasecmp (targets[i], "nickserv") == 0)
/* check if the password must be hidden for this nick */
hide_password = 0;
if (irc_config_nicks_hide_password)
{
msg_pwd_hidden = strdup (argv_eol[arg_text]);
if (msg_pwd_hidden
&& (weechat_config_boolean (irc_config_look_hide_nickserv_pwd)))
irc_display_hide_password (msg_pwd_hidden, 0);
for (j = 0; j < irc_config_num_nicks_hide_password; j++)
{
if (weechat_strcasecmp (irc_config_nicks_hide_password[j],
targets[i]) == 0)
{
hide_password = 1;
break;
}
}
}
if (hide_password)
{
/* hide password in message displayed using modifier */
msg_pwd_hidden = weechat_hook_modifier_exec ("irc_message_auth",
ptr_server->name,
argv_eol[arg_text]);
string = irc_color_decode (
(msg_pwd_hidden) ? msg_pwd_hidden : argv_eol[arg_text],
weechat_config_boolean (irc_config_network_colors_receive));
@ -3945,6 +3990,358 @@ irc_command_saquit (void *data, struct t_gui_buffer *buffer, int argc,
return WEECHAT_RC_OK;
}
/*
* Displays server options.
*/
void
irc_command_display_server (struct t_irc_server *server, int with_detail)
{
char *cmd_pwd_hidden;
int num_channels, num_pv;
if (with_detail)
{
weechat_printf (NULL, "");
weechat_printf (NULL, _("Server: %s%s %s[%s%s%s]%s%s"),
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
/* addresses */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ADDRESSES]))
weechat_printf (NULL, " addresses. . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_ADDRESSES));
else
weechat_printf (NULL, " addresses. . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_ADDRESSES]));
/* proxy */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PROXY]))
weechat_printf (NULL, " proxy. . . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PROXY));
else
weechat_printf (NULL, " proxy. . . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_PROXY]));
/* ipv6 */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_IPV6]))
weechat_printf (NULL, " ipv6 . . . . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_IPV6)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ipv6 . . . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6]) ?
_("on") : _("off"));
/* ssl */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL]))
weechat_printf (NULL, " ssl. . . . . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ssl. . . . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL]) ?
_("on") : _("off"));
/* ssl_cert */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_CERT]))
weechat_printf (NULL, " ssl_cert . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_CERT));
else
weechat_printf (NULL, " ssl_cert . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_CERT]));
/* ssl_priorities */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]))
weechat_printf (NULL, " ssl_priorities . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_PRIORITIES));
else
weechat_printf (NULL, " ssl_priorities . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]));
/* ssl_dhkey_size */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]))
weechat_printf (NULL, " ssl_dhkey_size . . . : (%d)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE));
else
weechat_printf (NULL, " ssl_dhkey_size . . . : %s%d",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]));
/* ssl_verify */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_VERIFY]))
weechat_printf (NULL, " ssl_verify . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL_VERIFY)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ssl_verify . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ?
_("on") : _("off"));
/* password */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PASSWORD]))
weechat_printf (NULL, " password . . . . . . : %s",
_("(hidden)"));
else
weechat_printf (NULL, " password . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
_("(hidden)"));
/* client capabilities */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CAPABILITIES]))
weechat_printf (NULL, " capabilities . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES));
else
weechat_printf (NULL, " capabilities . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_CAPABILITIES]));
/* sasl_mechanism */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_printf (NULL, " sasl_mechanism . . . : ('%s')",
irc_sasl_mechanism_string[IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
else
weechat_printf (NULL, " sasl_mechanism . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
irc_sasl_mechanism_string[weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
/* sasl_username */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_USERNAME]))
weechat_printf (NULL, " sasl_username. . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SASL_USERNAME));
else
weechat_printf (NULL, " sasl_username. . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SASL_USERNAME]));
/* sasl_password */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_PASSWORD]))
weechat_printf (NULL, " sasl_password. . . . : %s",
_("(hidden)"));
else
weechat_printf (NULL, " sasl_password. . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
_("(hidden)"));
/* autoconnect */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOCONNECT]))
weechat_printf (NULL, " autoconnect. . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTOCONNECT)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autoconnect. . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ?
_("on") : _("off"));
/* autoreconnect */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT]))
weechat_printf (NULL, " autoreconnect. . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTORECONNECT)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autoreconnect. . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ?
_("on") : _("off"));
/* autoreconnect_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]))
weechat_printf (NULL, " autoreconnect_delay. : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY)));
else
weechat_printf (NULL, " autoreconnect_delay. : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY])));
/* nicks */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NICKS]))
weechat_printf (NULL, " nicks. . . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_NICKS));
else
weechat_printf (NULL, " nicks. . . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_NICKS]));
/* username */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERNAME]))
weechat_printf (NULL, " username . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME));
else
weechat_printf (NULL, " username . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_USERNAME]));
/* realname */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_REALNAME]))
weechat_printf (NULL, " realname . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME));
else
weechat_printf (NULL, " realname . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_REALNAME]));
/* local_hostname */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]))
weechat_printf (NULL, " local_hostname . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME));
else
weechat_printf (NULL, " local_hostname . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]));
/* command */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND]))
{
cmd_pwd_hidden = weechat_hook_modifier_exec ("irc_command_auth",
server->name,
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND));
weechat_printf (NULL, " command. . . . . . . : ('%s')",
(cmd_pwd_hidden) ? cmd_pwd_hidden : IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND));
if (cmd_pwd_hidden)
free (cmd_pwd_hidden);
}
else
{
cmd_pwd_hidden = weechat_hook_modifier_exec ("irc_command_auth",
server->name,
weechat_config_string (server->options[IRC_SERVER_OPTION_COMMAND]));
weechat_printf (NULL, " command. . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
(cmd_pwd_hidden) ? cmd_pwd_hidden : weechat_config_string (server->options[IRC_SERVER_OPTION_COMMAND]));
if (cmd_pwd_hidden)
free (cmd_pwd_hidden);
}
/* command_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND_DELAY]))
weechat_printf (NULL, " command_delay. . . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_COMMAND_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_COMMAND_DELAY)));
else
weechat_printf (NULL, " command_delay. . . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_COMMAND_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_COMMAND_DELAY])));
/* autojoin */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOJOIN]))
weechat_printf (NULL, " autojoin . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_AUTOJOIN));
else
weechat_printf (NULL, " autojoin . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_AUTOJOIN]));
/* autorejoin */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN]))
weechat_printf (NULL, " autorejoin . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTOREJOIN)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autorejoin . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ?
_("on") : _("off"));
/* autorejoin_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]))
weechat_printf (NULL, " autorejoin_delay . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTOREJOIN_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTOREJOIN_DELAY)));
else
weechat_printf (NULL, " autorejoin_delay . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY])));
/* connection_timeout */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT]))
weechat_printf (NULL, " connection_timeout . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_CONNECTION_TIMEOUT),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_CONNECTION_TIMEOUT)));
else
weechat_printf (NULL, " connection_timeout . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT])));
/* anti_flood_prio_high */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH]))
weechat_printf (NULL, " anti_flood_prio_high : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH)));
else
weechat_printf (NULL, " anti_flood_prio_high : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH])));
/* anti_flood_prio_low */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW]))
weechat_printf (NULL, " anti_flood_prio_low. : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW)));
else
weechat_printf (NULL, " anti_flood_prio_low. : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW])));
/* away_check */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AWAY_CHECK]))
weechat_printf (NULL, " away_check . . . . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK),
NG_("minute", "minutes", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK)));
else
weechat_printf (NULL, " away_check . . . . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK]),
NG_("minute", "minutes", weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK])));
/* away_check_max_nicks */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]))
weechat_printf (NULL, " away_check_max_nicks : (%d)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS));
else
weechat_printf (NULL, " away_check_max_nicks : %s%d",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]));
/* default_msg_part */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]))
weechat_printf (NULL, " default_msg_part . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_PART));
else
weechat_printf (NULL, " default_msg_part . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]));
/* default_msg_quit */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]))
weechat_printf (NULL, " default_msg_quit . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_QUIT));
else
weechat_printf (NULL, " default_msg_quit . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]));
}
else
{
if (server->is_connected)
{
num_channels = irc_server_get_channel_count (server);
num_pv = irc_server_get_pv_count (server);
weechat_printf (NULL, " %s %s%s %s[%s%s%s]%s%s, %d %s, %d pv",
(server->is_connected) ? "*" : " ",
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "",
num_channels,
NG_("channel", "channels", num_channels),
num_pv);
}
else
{
weechat_printf (NULL, " %s%s%s%s",
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
}
}
}
/*
* Callback for command "/server": manages IRC servers.
*/
@ -3992,7 +4389,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
for (ptr_server2 = irc_servers; ptr_server2;
ptr_server2 = ptr_server2->next_server)
{
irc_display_server (ptr_server2, detailed_list);
irc_command_display_server (ptr_server2, detailed_list);
}
}
else
@ -4014,7 +4411,7 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
server_name);
}
one_server_found = 1;
irc_display_server (ptr_server2, detailed_list);
irc_command_display_server (ptr_server2, detailed_list);
}
}
if (!one_server_found)

56
src/plugins/irc/irc-config.c
View File

@ -79,13 +79,13 @@ struct t_config_option *irc_config_look_item_away_message;
struct t_config_option *irc_config_look_item_channel_modes_hide_key;
struct t_config_option *irc_config_look_item_nick_modes;
struct t_config_option *irc_config_look_item_nick_prefix;
struct t_config_option *irc_config_look_hide_nickserv_pwd;
struct t_config_option *irc_config_look_highlight_server;
struct t_config_option *irc_config_look_highlight_channel;
struct t_config_option *irc_config_look_highlight_pv;
struct t_config_option *irc_config_look_highlight_tags;
struct t_config_option *irc_config_look_item_display_server;
struct t_config_option *irc_config_look_msgbuffer_fallback;
struct t_config_option *irc_config_look_nicks_hide_password;
struct t_config_option *irc_config_look_notice_as_pv;
struct t_config_option *irc_config_look_notify_tags_ison;
struct t_config_option *irc_config_look_notify_tags_whois;
@ -143,6 +143,8 @@ int irc_config_num_nick_colors = 0;
struct t_hashtable *irc_config_hashtable_nick_color_force = NULL;
struct t_hashtable *irc_config_hashtable_nick_prefixes = NULL;
struct t_hashtable *irc_config_hashtable_color_mirc_remap = NULL;
char **irc_config_nicks_hide_password = NULL;
int irc_config_num_nicks_hide_password = 0;
int irc_config_write_temp_servers = 0;
@ -490,6 +492,36 @@ irc_config_change_look_item_display_server (void *data,
weechat_bar_item_update ("buffer_name");
}
/*
* Callback for changes on option "irc.look.nicks_hide_password".
*/
void
irc_config_change_look_nicks_hide_password (void *data,
struct t_config_option *option)
{
const char *nicks_hide_password;
/* make C compiler happy */
(void) data;
(void) option;
if (irc_config_nicks_hide_password)
{
weechat_string_free_split (irc_config_nicks_hide_password);
irc_config_nicks_hide_password = NULL;
}
irc_config_num_nicks_hide_password = 0;
nicks_hide_password = weechat_config_string (irc_config_look_nicks_hide_password);
if (nicks_hide_password && nicks_hide_password[0])
{
irc_config_nicks_hide_password = weechat_string_split (nicks_hide_password,
",", 0, 0,
&irc_config_num_nicks_hide_password);
}
}
/*
* Callback for changes on option "irc.look.topic_strip_colors".
*/
@ -2195,11 +2227,6 @@ irc_config_init ()
N_("display nick prefix in \"input_prompt\" bar item"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL,
&irc_config_change_look_item_nick_prefix, NULL, NULL, NULL);
irc_config_look_hide_nickserv_pwd = weechat_config_new_option (
irc_config_file, ptr_section,
"hide_nickserv_pwd", "boolean",
N_("hide password displayed by nickserv"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_highlight_server = weechat_config_new_option (
irc_config_file, ptr_section,
"highlight_server", "string",
@ -2257,6 +2284,15 @@ irc_config_init ()
"private and that private buffer is not found"),
"current|server", 0, 0, "current", NULL, 0, NULL, NULL,
NULL, NULL, NULL, NULL);
irc_config_look_nicks_hide_password = weechat_config_new_option (
irc_config_file, ptr_section,
"nicks_hide_password", "string",
N_("comma separated list of nicks for which passwords will be hidden "
"when a message is sent, for example to hide password in message "
"displayed by \"/msg nickserv identify password\", example: "
"\"nickserv,nickbot\""),
NULL, 0, 0, "nickserv", NULL, 0, NULL, NULL,
&irc_config_change_look_nicks_hide_password, NULL, NULL, NULL);
irc_config_look_notice_as_pv = weechat_config_new_option (
irc_config_file, ptr_section,
"notice_as_pv", "integer",
@ -2647,6 +2683,7 @@ irc_config_read ()
{
irc_notify_new_for_all_servers ();
irc_config_change_look_nick_color_force (NULL, NULL);
irc_config_change_look_nicks_hide_password (NULL, NULL);
irc_config_change_color_nick_prefixes (NULL, NULL);
irc_config_change_color_mirc_remap (NULL, NULL);
irc_config_change_network_notify_check_ison (NULL, NULL);
@ -2688,6 +2725,13 @@ irc_config_free ()
irc_config_num_nick_colors = 0;
}
if (irc_config_nicks_hide_password)
{
weechat_string_free_split (irc_config_nicks_hide_password);
irc_config_nicks_hide_password = NULL;
irc_config_num_nicks_hide_password = 0;
}
if (irc_config_hashtable_nick_color_force)
{
weechat_hashtable_free (irc_config_hashtable_nick_color_force);

4
src/plugins/irc/irc-config.h
View File

@ -114,13 +114,13 @@ extern struct t_config_option *irc_config_look_item_away_message;
extern struct t_config_option *irc_config_look_item_channel_modes_hide_key;
extern struct t_config_option *irc_config_look_item_nick_modes;
extern struct t_config_option *irc_config_look_item_nick_prefix;
extern struct t_config_option *irc_config_look_hide_nickserv_pwd;
extern struct t_config_option *irc_config_look_highlight_server;
extern struct t_config_option *irc_config_look_highlight_channel;
extern struct t_config_option *irc_config_look_highlight_pv;
extern struct t_config_option *irc_config_look_highlight_tags;
extern struct t_config_option *irc_config_look_item_display_server;
extern struct t_config_option *irc_config_look_msgbuffer_fallback;
extern struct t_config_option *irc_config_look_nicks_hide_password;
extern struct t_config_option *irc_config_look_notice_as_pv;
extern struct t_config_option *irc_config_look_notify_tags_ison;
extern struct t_config_option *irc_config_look_notify_tags_whois;
@ -172,6 +172,8 @@ extern int irc_config_num_nick_colors;
extern struct t_hashtable *irc_config_hashtable_nick_color_force;
extern struct t_hashtable *irc_config_hashtable_nick_prefixes;
extern struct t_hashtable *irc_config_hashtable_color_mirc_remap;
extern char **irc_config_nicks_hide_password;
extern int irc_config_num_nicks_hide_password;
extern void irc_config_set_nick_colors ();
extern int irc_config_server_check_value_cb (void *data,

481
src/plugins/irc/irc-display.c
View File

@ -1,481 +0,0 @@
/*
* irc-display.c - display functions for IRC plugin
*
* Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
*
* This file is part of WeeChat, the extensible chat client.
*
* WeeChat is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* WeeChat is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <string.h>
#include "../weechat-plugin.h"
#include "irc.h"
#include "irc-channel.h"
#include "irc-color.h"
#include "irc-command.h"
#include "irc-config.h"
#include "irc-nick.h"
#include "irc-server.h"
#include "irc-sasl.h"
/*
* Hides IRC password(s) in a string.
*/
void
irc_display_hide_password (char *string, int look_for_nickserv)
{
char *pos_nickserv, *pos, *pos_pwd;
int char_size;
pos = string;
while (pos)
{
if (look_for_nickserv)
{
pos_nickserv = strstr (pos, "nickserv ");
if (!pos_nickserv)
return;
pos = pos_nickserv + 9;
while (pos[0] == ' ')
{
pos++;
}
if (strncmp (pos, "identify ", 9) == 0)
pos_pwd = pos + 9;
else if (strncmp (pos, "register ", 9) == 0)
pos_pwd = pos + 9;
else
pos_pwd = NULL;
}
else
{
pos_pwd = strstr (pos, "identify ");
if (pos_pwd)
pos_pwd += 9;
else
{
pos_pwd = strstr (pos, "register ");
if (pos_pwd)
pos_pwd += 9;
}
if (!pos_pwd)
return;
}
if (pos_pwd)
{
while (pos_pwd[0] == ' ')
{
pos_pwd++;
}
while (pos_pwd && pos_pwd[0])
{
char_size = weechat_utf8_char_size (pos_pwd);
if (char_size > 0)
memset (pos_pwd, '*', char_size);
pos_pwd = weechat_utf8_next_char (pos_pwd);
}
pos = pos_pwd;
}
}
}
/*
* Displays away on all channels of all servers.
*/
void
irc_display_away (struct t_irc_server *server, const char *string1,
const char *string2)
{
struct t_irc_channel *ptr_channel;
for (ptr_channel = server->channels; ptr_channel;
ptr_channel = ptr_channel->next_channel)
{
if (ptr_channel->type == IRC_CHANNEL_TYPE_CHANNEL)
{
weechat_printf_tags (ptr_channel->buffer,
"away_info",
"%s[%s%s%s %s: %s%s]",
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
IRC_COLOR_RESET,
string1,
string2,
IRC_COLOR_CHAT_DELIMITERS);
}
}
}
/*
* Displays server options.
*/
void
irc_display_server (struct t_irc_server *server, int with_detail)
{
char *string;
int num_channels, num_pv;
if (with_detail)
{
weechat_printf (NULL, "");
weechat_printf (NULL, _("Server: %s%s %s[%s%s%s]%s%s"),
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
/* addresses */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ADDRESSES]))
weechat_printf (NULL, " addresses. . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_ADDRESSES));
else
weechat_printf (NULL, " addresses. . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_ADDRESSES]));
/* proxy */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PROXY]))
weechat_printf (NULL, " proxy. . . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PROXY));
else
weechat_printf (NULL, " proxy. . . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_PROXY]));
/* ipv6 */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_IPV6]))
weechat_printf (NULL, " ipv6 . . . . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_IPV6)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ipv6 . . . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6]) ?
_("on") : _("off"));
/* ssl */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL]))
weechat_printf (NULL, " ssl. . . . . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ssl. . . . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL]) ?
_("on") : _("off"));
/* ssl_cert */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_CERT]))
weechat_printf (NULL, " ssl_cert . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_CERT));
else
weechat_printf (NULL, " ssl_cert . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_CERT]));
/* ssl_priorities */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]))
weechat_printf (NULL, " ssl_priorities . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SSL_PRIORITIES));
else
weechat_printf (NULL, " ssl_priorities . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SSL_PRIORITIES]));
/* ssl_dhkey_size */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]))
weechat_printf (NULL, " ssl_dhkey_size . . . : (%d)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SSL_DHKEY_SIZE));
else
weechat_printf (NULL, " ssl_dhkey_size . . . : %s%d",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_SSL_DHKEY_SIZE]));
/* ssl_verify */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_VERIFY]))
weechat_printf (NULL, " ssl_verify . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_SSL_VERIFY)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " ssl_verify . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ?
_("on") : _("off"));
/* password */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PASSWORD]))
weechat_printf (NULL, " password . . . . . . : %s",
_("(hidden)"));
else
weechat_printf (NULL, " password . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
_("(hidden)"));
/* client capabilities */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CAPABILITIES]))
weechat_printf (NULL, " capabilities . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES));
else
weechat_printf (NULL, " capabilities . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_CAPABILITIES]));
/* sasl_mechanism */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_printf (NULL, " sasl_mechanism . . . : ('%s')",
irc_sasl_mechanism_string[IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_MECHANISM)]);
else
weechat_printf (NULL, " sasl_mechanism . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
irc_sasl_mechanism_string[weechat_config_integer (server->options[IRC_SERVER_OPTION_SASL_MECHANISM])]);
/* sasl_username */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_USERNAME]))
weechat_printf (NULL, " sasl_username. . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_SASL_USERNAME));
else
weechat_printf (NULL, " sasl_username. . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_SASL_USERNAME]));
/* sasl_password */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_PASSWORD]))
weechat_printf (NULL, " sasl_password. . . . : %s",
_("(hidden)"));
else
weechat_printf (NULL, " sasl_password. . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
_("(hidden)"));
/* autoconnect */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOCONNECT]))
weechat_printf (NULL, " autoconnect. . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTOCONNECT)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autoconnect. . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ?
_("on") : _("off"));
/* autoreconnect */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT]))
weechat_printf (NULL, " autoreconnect. . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTORECONNECT)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autoreconnect. . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ?
_("on") : _("off"));
/* autoreconnect_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]))
weechat_printf (NULL, " autoreconnect_delay. : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTORECONNECT_DELAY)));
else
weechat_printf (NULL, " autoreconnect_delay. : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY])));
/* nicks */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NICKS]))
weechat_printf (NULL, " nicks. . . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_NICKS));
else
weechat_printf (NULL, " nicks. . . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_NICKS]));
/* username */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERNAME]))
weechat_printf (NULL, " username . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME));
else
weechat_printf (NULL, " username . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_USERNAME]));
/* realname */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_REALNAME]))
weechat_printf (NULL, " realname . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME));
else
weechat_printf (NULL, " realname . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_REALNAME]));
/* local_hostname */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]))
weechat_printf (NULL, " local_hostname . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_LOCAL_HOSTNAME));
else
weechat_printf (NULL, " local_hostname . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_LOCAL_HOSTNAME]));
/* command */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND]))
{
string = strdup (IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND));
if (string && weechat_config_boolean (irc_config_look_hide_nickserv_pwd))
irc_display_hide_password (string, 1);
weechat_printf (NULL, " command. . . . . . . : ('%s')",
(string) ? string : IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_COMMAND));
if (string)
free (string);
}
else
{
string = strdup (weechat_config_string (server->options[IRC_SERVER_OPTION_COMMAND]));
if (string && weechat_config_boolean (irc_config_look_hide_nickserv_pwd))
irc_display_hide_password (string, 1);
weechat_printf (NULL, " command. . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
(string) ? string : weechat_config_string (server->options[IRC_SERVER_OPTION_COMMAND]));
if (string)
free (string);
}
/* command_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_COMMAND_DELAY]))
weechat_printf (NULL, " command_delay. . . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_COMMAND_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_COMMAND_DELAY)));
else
weechat_printf (NULL, " command_delay. . . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_COMMAND_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_COMMAND_DELAY])));
/* autojoin */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOJOIN]))
weechat_printf (NULL, " autojoin . . . . . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_AUTOJOIN));
else
weechat_printf (NULL, " autojoin . . . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_AUTOJOIN]));
/* autorejoin */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN]))
weechat_printf (NULL, " autorejoin . . . . . : (%s)",
(IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_AUTOREJOIN)) ?
_("on") : _("off"));
else
weechat_printf (NULL, " autorejoin . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ?
_("on") : _("off"));
/* autorejoin_delay */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]))
weechat_printf (NULL, " autorejoin_delay . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTOREJOIN_DELAY),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AUTOREJOIN_DELAY)));
else
weechat_printf (NULL, " autorejoin_delay . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY])));
/* connection_timeout */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT]))
weechat_printf (NULL, " connection_timeout . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_CONNECTION_TIMEOUT),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_CONNECTION_TIMEOUT)));
else
weechat_printf (NULL, " connection_timeout . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_CONNECTION_TIMEOUT])));
/* anti_flood_prio_high */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH]))
weechat_printf (NULL, " anti_flood_prio_high : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH)));
else
weechat_printf (NULL, " anti_flood_prio_high : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_HIGH])));
/* anti_flood_prio_low */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW]))
weechat_printf (NULL, " anti_flood_prio_low. : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW),
NG_("second", "seconds", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW)));
else
weechat_printf (NULL, " anti_flood_prio_low. : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW]),
NG_("second", "seconds", weechat_config_integer (server->options[IRC_SERVER_OPTION_ANTI_FLOOD_PRIO_LOW])));
/* away_check */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AWAY_CHECK]))
weechat_printf (NULL, " away_check . . . . . : (%d %s)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK),
NG_("minute", "minutes", IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK)));
else
weechat_printf (NULL, " away_check . . . . . : %s%d %s",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK]),
NG_("minute", "minutes", weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK])));
/* away_check_max_nicks */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]))
weechat_printf (NULL, " away_check_max_nicks : (%d)",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS));
else
weechat_printf (NULL, " away_check_max_nicks : %s%d",
IRC_COLOR_CHAT_VALUE,
weechat_config_integer (server->options[IRC_SERVER_OPTION_AWAY_CHECK_MAX_NICKS]));
/* default_msg_part */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]))
weechat_printf (NULL, " default_msg_part . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_PART));
else
weechat_printf (NULL, " default_msg_part . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_PART]));
/* default_msg_quit */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]))
weechat_printf (NULL, " default_msg_quit . . : ('%s')",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_MSG_QUIT));
else
weechat_printf (NULL, " default_msg_quit . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
weechat_config_string (server->options[IRC_SERVER_OPTION_DEFAULT_MSG_QUIT]));
}
else
{
if (server->is_connected)
{
num_channels = irc_server_get_channel_count (server);
num_pv = irc_server_get_pv_count (server);
weechat_printf (NULL, " %s %s%s %s[%s%s%s]%s%s, %d %s, %d pv",
(server->is_connected) ? "*" : " ",
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "",
num_channels,
NG_("channel", "channels", num_channels),
num_pv);
}
else
{
weechat_printf (NULL, " %s%s%s%s",
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_RESET,
(server->temp_server) ? _(" (temporary)") : "");
}
}
}

28
src/plugins/irc/irc-display.h
View File

@ -1,28 +0,0 @@
/*
* Copyright (C) 2003-2013 Sebastien Helleu <flashcode@flashtux.org>
*
* This file is part of WeeChat, the extensible chat client.
*
* WeeChat is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* WeeChat is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __WEECHAT_IRC_DISPLAY_H
#define __WEECHAT_IRC_DISPLAY_H 1
extern void irc_display_hide_password (char *string, int look_for_nickserv);
extern void irc_display_away (struct t_irc_server *server, const char *string1,
const char *string2);
extern void irc_display_server (struct t_irc_server *server, int with_detail);
#endif /* __WEECHAT_IRC_DISPLAY_H */