From c832116caeb2d001bc9c765a59c1053e3ad1cc9d Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 7 Dec 2013 22:38:58 +0100 Subject: [PATCH] irc: rename option irc.look.ban_mask_default to irc.network.ban_mask_default --- ChangeLog | 2 +- doc/de/autogen/user/irc_options.txt | 10 +++++----- doc/en/autogen/user/irc_options.txt | 10 +++++----- doc/fr/autogen/user/irc_options.txt | 10 +++++----- doc/it/autogen/user/irc_options.txt | 10 +++++----- doc/ja/autogen/user/irc_options.txt | 10 +++++----- po/cs.po | 14 +++++++------- po/de.po | 14 +++++++------- po/es.po | 14 +++++++------- po/fr.po | 22 +++++++++++----------- po/hu.po | 14 +++++++------- po/it.po | 14 +++++++------- po/ja.po | 14 +++++++------- po/pl.po | 14 +++++++------- po/pt_BR.po | 14 +++++++------- po/ru.po | 14 +++++++------- po/tr.po | 14 +++++++------- po/weechat.pot | 14 +++++++------- src/plugins/irc/irc-config.c | 20 ++++++++++---------- src/plugins/irc/irc-config.h | 2 +- src/plugins/irc/irc-nick.c | 2 +- 21 files changed, 126 insertions(+), 126 deletions(-) diff --git a/ChangeLog b/ChangeLog index a616e8143..059b80b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,7 +49,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * aspell: fix detection of nicks with non-alphanumeric chars * guile: disable guile gmp allocator (fix crash on unload of relay plugin) (bug #40628) -* irc: add option irc.look.ban_mask_default (bug #26571) +* irc: add option irc.network.ban_mask_default (bug #26571) * irc: add option irc.network.lag_max * irc: fix ignore on a host without nick * irc: use color code 0x1F (`ctrl-_`) for underlined text in input line (same diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 7452e8321..072af1372 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -63,11 +63,6 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `darkgray`) -* [[option_irc.look.ban_mask_default]] *irc.look.ban_mask_default* -** Beschreibung: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` -** Typ: Zeichenkette -** Werte: beliebige Zeichenkette (Standardwert: `"*!$user@$host"`) - * [[option_irc.look.buffer_switch_autojoin]] *irc.look.buffer_switch_autojoin* ** Beschreibung: `wechselt automatisch zum Channel-Buffer falls dieser automatisch betreten wurde (mittels der Serveroption "autojoin")` ** Typ: boolesch @@ -353,6 +348,11 @@ ** Typ: integer ** Werte: 0 .. 86400 (Standardwert: `1800`) +* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default* +** Beschreibung: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"*!$user@$host"`) + * [[option_irc.network.colors_receive]] *irc.network.colors_receive* ** Beschreibung: `wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert` ** Typ: boolesch diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index c947af84b..4f27958cf 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -63,11 +63,6 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (default value: `darkgray`) -* [[option_irc.look.ban_mask_default]] *irc.look.ban_mask_default* -** description: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` -** type: string -** values: any string (default value: `"*!$user@$host"`) - * [[option_irc.look.buffer_switch_autojoin]] *irc.look.buffer_switch_autojoin* ** description: `auto switch to channel buffer when it is auto joined (with server option "autojoin")` ** type: boolean @@ -353,6 +348,11 @@ ** type: integer ** values: 0 .. 86400 (default value: `1800`) +* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default* +** description: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` +** type: string +** values: any string (default value: `"*!$user@$host"`) + * [[option_irc.network.colors_receive]] *irc.network.colors_receive* ** description: `when off, colors codes are ignored in incoming messages` ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index e5552b5ca..ef03c0ac0 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -63,11 +63,6 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné (valeur par défaut: `darkgray`) -* [[option_irc.look.ban_mask_default]] *irc.look.ban_mask_default* -** description: `masque de bannissement par défaut pour les commandes /ban, /unban et /kickban; les variables $nick, $user et $host sont remplacées par leurs valeurs (extraites de "nick!user@host"); ce masque par défaut est utilisé seulement si WeeChat connaît l'hôte pour le pseudo` -** type: chaîne -** valeurs: toute chaîne (valeur par défaut: `"*!$user@$host"`) - * [[option_irc.look.buffer_switch_autojoin]] *irc.look.buffer_switch_autojoin* ** description: `basculer automatiquement vers le tampon du canal lorsqu'il est automatiquement rejoint (avec l'option du serveur "autojoin")` ** type: booléen @@ -353,6 +348,11 @@ ** type: entier ** valeurs: 0 .. 86400 (valeur par défaut: `1800`) +* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default* +** description: `masque de bannissement par défaut pour les commandes /ban, /unban et /kickban; les variables $nick, $user et $host sont remplacées par leurs valeurs (extraites de "nick!user@host"); ce masque par défaut est utilisé seulement si WeeChat connaît l'hôte pour le pseudo` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"*!$user@$host"`) + * [[option_irc.network.colors_receive]] *irc.network.colors_receive* ** description: `si désactivé, les codes couleurs des messages entrants sont ignorés` ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index dab77c34d..08df42b78 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -63,11 +63,6 @@ ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (valore predefinito: `darkgray`) -* [[option_irc.look.ban_mask_default]] *irc.look.ban_mask_default* -** descrizione: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` -** tipo: stringa -** valori: qualsiasi stringa (valore predefinito: `"*!$user@$host"`) - * [[option_irc.look.buffer_switch_autojoin]] *irc.look.buffer_switch_autojoin* ** descrizione: `passa automaticamente al buffer del canale con l'ingresso automatico abilitato (con l'opzione del server "autojoin")` ** tipo: bool @@ -353,6 +348,11 @@ ** tipo: intero ** valori: 0 .. 86400 (valore predefinito: `1800`) +* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default* +** descrizione: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"*!$user@$host"`) + * [[option_irc.network.colors_receive]] *irc.network.colors_receive* ** descrizione: `se disabilitato, i codici colori vengono ignorati nei messaggi in entrata` ** tipo: bool diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index 24c93000f..34fa3d5b3 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -63,11 +63,6 @@ ** タイプ: 色 ** 値: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (デフォルト値: `darkgray`) -* [[option_irc.look.ban_mask_default]] *irc.look.ban_mask_default* -** 説明: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` -** タイプ: 文字列 -** 値: 未制約文字列 (デフォルト値: `"*!$user@$host"`) - * [[option_irc.look.buffer_switch_autojoin]] *irc.look.buffer_switch_autojoin* ** 説明: `自動で参加した場合に、自動的にチャンネルバッファを移動 (サーバオプション "autojoin" と共に使用)` ** タイプ: ブール @@ -353,6 +348,11 @@ ** タイプ: 整数 ** 値: 0 .. 86400 (デフォルト値: `1800`) +* [[option_irc.network.ban_mask_default]] *irc.network.ban_mask_default* +** 説明: `default ban mask for commands /ban, /unban and /kickban; variables $nick, $user and $host are replaced by their values (extracted from "nick!user@host"); this default mask is used only if WeeChat knows the host for the nick` +** タイプ: 文字列 +** 値: 未制約文字列 (デフォルト値: `"*!$user@$host"`) + * [[option_irc.network.colors_receive]] *irc.network.colors_receive* ** 説明: `オフの場合、到着メッセージに含まれる色コードを無視` ** タイプ: ブール diff --git a/po/cs.po b/po/cs.po index b88797fe7..43f8cf3d7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -6217,12 +6217,6 @@ msgstr "%s%s: chyba při vytváření serveru \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: chyba při vytváření volby serveru \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6620,6 +6614,12 @@ msgstr "" "maximální délka prodlevy automatíckého znovupřipojení k serveru (v " "sekundách, 0 = žádné maximum)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "pokud je off, jsou barvy v příchozích zprávách ignorovány" diff --git a/po/de.po b/po/de.po index cbb6cec75..350ac91d2 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-20 15:12+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -6953,12 +6953,6 @@ msgstr "%s%s: Fehler bei der Erstellung des Servers \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: Fehler bei der Erstellung der Serveroption \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -7459,6 +7453,12 @@ msgstr "" "maximale Verzögerung bei der automatischen Wiederverbindung zum Server (in " "Sekunden, 0 = keine Begrenzung)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" "wenn deaktiviert, werden Farben-Codes von eingehenden Nachrichten ignoriert" diff --git a/po/es.po b/po/es.po index 75d655e4f..8b4814124 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -6452,12 +6452,6 @@ msgstr "%s%s: error al crear el servidor \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: error al crear la opción \"%s\" del servidor" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6885,6 +6879,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "retraso máximo para la autoreconexión (en segundos, 0 = sin máximo)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" "cuando se desactiva, los códigos de color se ignoran en los mensajes " diff --git a/po/fr.po b/po/fr.po index 62223a1fe..6c681cf4f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-12-07 18:17+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" @@ -6779,16 +6779,6 @@ msgstr "%s%s: erreur de création du serveur \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: erreur de création de l'option serveur \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" -"masque de bannissement par défaut pour les commandes /ban, /unban et /" -"kickban; les variables $nick, $user et $host sont remplacées par leurs " -"valeurs (extraites de \"nick!user@host\"); ce masque par défaut est utilisé " -"seulement si WeeChat connaît l'hôte pour le pseudo" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -7254,6 +7244,16 @@ msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "" "délai maximum d'auto-reconnexion au serveur (en secondes, 0 = pas de maximum)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" +"masque de bannissement par défaut pour les commandes /ban, /unban et /" +"kickban; les variables $nick, $user et $host sont remplacées par leurs " +"valeurs (extraites de \"nick!user@host\"); ce masque par défaut est utilisé " +"seulement si WeeChat connaît l'hôte pour le pseudo" + msgid "when off, colors codes are ignored in incoming messages" msgstr "si désactivé, les codes couleurs des messages entrants sont ignorés" diff --git a/po/hu.po b/po/hu.po index b91b2858a..268ddb1bf 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5754,12 +5754,6 @@ msgstr "%s nincs elég memória az információs pult üzenethez\n" msgid "%s%s: error creating server option \"%s\"" msgstr "%s nincs elég memória az információs pult üzenethez\n" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6107,6 +6101,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" diff --git a/po/it.po b/po/it.po index 97c017769..3e8c58412 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -6578,12 +6578,6 @@ msgstr "%s%s: errore durante la creazione del server \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: errore durante la creazione dell'opzione del server \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -7021,6 +7015,12 @@ msgstr "" "ritardo massimo per la riconnessione automatica al server (in secondi, 0 = " "nessun massimo)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" "se disabilitato, i codici colori vengono ignorati nei messaggi in entrata" diff --git a/po/ja.po b/po/ja.po index f8e46f0f5..631bf4b9d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6508,12 +6508,6 @@ msgstr "%s%s: サーバ \"%s\" 作成中のエラー" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: サーバオプション \"%s\" 作成中にエラー" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6952,6 +6946,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "サーバへの自動接続の遅延時間の最大値 (秒単位、0 = 制限無し)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "オフの場合、到着メッセージに含まれる色コードを無視" diff --git a/po/pl.po b/po/pl.po index 4dca9b995..f5a6dd2d3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-11 09:07+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6663,12 +6663,6 @@ msgstr "%s%s: błąd podczas tworzenia serwera \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: błąd podczas tworzenia opcji dla serwera \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -7122,6 +7116,12 @@ msgstr "" "maksymalne opóźnienie do ponownego połączenia z serwerem (w sekundach, 0 = " "brak maksimum)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" "kiedy wyłączone (off) kody kolorów są ignorowane w przychodzących " diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d45b8ce4..525355ec0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -5966,12 +5966,6 @@ msgstr "%s%s: erro ao criar servidor \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: erro ao criar opção do servidor \"%s\"" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6325,6 +6319,12 @@ msgstr "" "máximo tempo de espera para auto-reconectar ao servidor (em segundos, 0 = " "sem máximo)" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" "quando desligado, códigos de cores são ignorados em mensagens recebidas" diff --git a/po/ru.po b/po/ru.po index db51c7628..0db9d3566 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:18+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5778,12 +5778,6 @@ msgstr "%s недостаточно памяти для сообщения в с msgid "%s%s: error creating server option \"%s\"" msgstr "%s недостаточно памяти для сообщения в строке информации\n" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -6131,6 +6125,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "когда выключено, цвета в исходящих сообщениях игнорируются" diff --git a/po/tr.po b/po/tr.po index 5fcc64c72..45fb406c1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-11-09 10:13+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5079,12 +5079,6 @@ msgstr "" msgid "%s%s: error creating server option \"%s\"" msgstr "" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -5411,6 +5405,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 662590b68..911e51132 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -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-12-07 18:16+0100\n" +"POT-Creation-Date: 2013-12-07 22:28+0100\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -5037,12 +5037,6 @@ msgstr "" msgid "%s%s: error creating server option \"%s\"" msgstr "" -msgid "" -"default ban mask for commands /ban, /unban and /kickban; variables $nick, " -"$user and $host are replaced by their values (extracted from \"nick!user@host" -"\"); this default mask is used only if WeeChat knows the host for the nick" -msgstr "" - msgid "" "auto switch to channel buffer when it is auto joined (with server option " "\"autojoin\")" @@ -5369,6 +5363,12 @@ msgstr "" msgid "maximum autoreconnect delay to server (in seconds, 0 = no maximum)" msgstr "" +msgid "" +"default ban mask for commands /ban, /unban and /kickban; variables $nick, " +"$user and $host are replaced by their values (extracted from \"nick!user@host" +"\"); this default mask is used only if WeeChat knows the host for the nick" +msgstr "" + msgid "when off, colors codes are ignored in incoming messages" msgstr "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index ff02d9385..49d06b575 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -48,7 +48,6 @@ struct t_config_section *irc_config_section_server = NULL; /* IRC config, look section */ -struct t_config_option *irc_config_look_ban_mask_default; struct t_config_option *irc_config_look_buffer_switch_autojoin; struct t_config_option *irc_config_look_buffer_switch_join; struct t_config_option *irc_config_look_color_nicks_in_names; @@ -125,6 +124,7 @@ struct t_config_option *irc_config_color_topic_old; struct t_config_option *irc_config_network_alternate_nick; struct t_config_option *irc_config_network_autoreconnect_delay_growing; struct t_config_option *irc_config_network_autoreconnect_delay_max; +struct t_config_option *irc_config_network_ban_mask_default; struct t_config_option *irc_config_network_colors_receive; struct t_config_option *irc_config_network_colors_send; struct t_config_option *irc_config_network_lag_check; @@ -2194,15 +2194,6 @@ irc_config_init () return 0; } - irc_config_look_ban_mask_default = weechat_config_new_option ( - irc_config_file, ptr_section, - "ban_mask_default", "string", - N_("default ban mask for commands /ban, /unban and /kickban; variables " - "$nick, $user and $host are replaced by their values (extracted " - "from \"nick!user@host\"); this default mask is used only if " - "WeeChat knows the host for the nick"), - NULL, 0, 0, "*!$user@$host", NULL, 0, NULL, NULL, - NULL, NULL, NULL, NULL); irc_config_look_buffer_switch_autojoin = weechat_config_new_option ( irc_config_file, ptr_section, "buffer_switch_autojoin", "boolean", @@ -2733,6 +2724,15 @@ irc_config_init () N_("maximum autoreconnect delay to server (in seconds, 0 = no maximum)"), NULL, 0, 3600 * 24, "1800", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_network_ban_mask_default = weechat_config_new_option ( + irc_config_file, ptr_section, + "ban_mask_default", "string", + N_("default ban mask for commands /ban, /unban and /kickban; variables " + "$nick, $user and $host are replaced by their values (extracted " + "from \"nick!user@host\"); this default mask is used only if " + "WeeChat knows the host for the nick"), + NULL, 0, 0, "*!$user@$host", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_network_colors_receive = weechat_config_new_option ( irc_config_file, ptr_section, "colors_receive", "boolean", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 86bf03044..6a0759455 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -96,7 +96,6 @@ extern struct t_config_section *irc_config_section_ctcp; extern struct t_config_section *irc_config_section_server_default; extern struct t_config_section *irc_config_section_server; -extern struct t_config_option *irc_config_look_ban_mask_default; extern struct t_config_option *irc_config_look_buffer_switch_autojoin; extern struct t_config_option *irc_config_look_buffer_switch_join; extern struct t_config_option *irc_config_look_color_nicks_in_names; @@ -169,6 +168,7 @@ extern struct t_config_option *irc_config_color_topic_old; extern struct t_config_option *irc_config_network_alternate_nick; extern struct t_config_option *irc_config_network_autoreconnect_delay_growing; extern struct t_config_option *irc_config_network_autoreconnect_delay_max; +extern struct t_config_option *irc_config_network_ban_mask_default; extern struct t_config_option *irc_config_network_colors_receive; extern struct t_config_option *irc_config_network_colors_send; extern struct t_config_option *irc_config_network_lag_check; diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index 0968d4b4d..38adf52fb 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -1061,7 +1061,7 @@ irc_nick_default_ban_mask (struct t_irc_nick *nick) if (!nick) return NULL; - ptr_ban_mask = weechat_config_string (irc_config_look_ban_mask_default); + ptr_ban_mask = weechat_config_string (irc_config_network_ban_mask_default); pos_hostname = (nick->host) ? strchr (nick->host, '@') : NULL;