diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | doc/de/includes/autogen_user_options.de.adoc | 14 | ||||
| -rw-r--r-- | doc/en/includes/autogen_user_options.en.adoc | 14 | ||||
| -rw-r--r-- | doc/fr/includes/autogen_user_options.fr.adoc | 14 | ||||
| -rw-r--r-- | doc/it/includes/autogen_user_options.it.adoc | 14 | ||||
| -rw-r--r-- | doc/ja/includes/autogen_user_options.ja.adoc | 14 | ||||
| -rw-r--r-- | doc/pl/includes/autogen_user_options.pl.adoc | 14 | ||||
| -rw-r--r-- | doc/sr/includes/autogen_user_options.sr.adoc | 14 | ||||
| -rw-r--r-- | po/cs.po | 28 | ||||
| -rw-r--r-- | po/de.po | 39 | ||||
| -rw-r--r-- | po/es.po | 28 | ||||
| -rw-r--r-- | po/fr.po | 29 | ||||
| -rw-r--r-- | po/hu.po | 25 | ||||
| -rw-r--r-- | po/it.po | 28 | ||||
| -rw-r--r-- | po/ja.po | 30 | ||||
| -rw-r--r-- | po/pl.po | 37 | ||||
| -rw-r--r-- | po/pt.po | 28 | ||||
| -rw-r--r-- | po/pt_BR.po | 25 | ||||
| -rw-r--r-- | po/ru.po | 25 | ||||
| -rw-r--r-- | po/sr.po | 37 | ||||
| -rw-r--r-- | po/tr.po | 37 | ||||
| -rw-r--r-- | po/weechat.pot | 17 | ||||
| -rw-r--r-- | src/plugins/irc/irc-channel.c | 8 | ||||
| -rw-r--r-- | src/plugins/irc/irc-color.h | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 19 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.h | 2 | ||||
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 133 | ||||
| -rw-r--r-- | tests/unit/plugins/irc/test-irc-protocol.cpp | 14 |
28 files changed, 552 insertions, 137 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index deccd75dc..aef97ec4e 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -25,6 +25,7 @@ New features:: * api: rename function string_build_with_split_string to string_rebuild_split_string, add arguments "index_start" and "index_end" * api: add info "uptime_current" * buflist: add variable `${hotlist_priority_number}` (integer version of `${hotlist_priority}`) + * irc: display SETNAME command in channels and private buffers, add options irc.color.message_setname and irc.look.smart_filter_setname (issue #1805) * irc: display an error message when using command /dcc without xfer plugin loaded Bug fixes:: diff --git a/doc/de/includes/autogen_user_options.de.adoc b/doc/de/includes/autogen_user_options.de.adoc index 730a1bd30..c9cdee85d 100644 --- a/doc/de/includes/autogen_user_options.de.adoc +++ b/doc/de/includes/autogen_user_options.de.adoc @@ -2133,7 +2133,7 @@ ** Standardwert: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** Beschreibung: pass:none[Textfarbe in der chghost Nachrichten dargestellt werden] +** Beschreibung: pass:none[color for text in "chghost" messages] ** 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: `+brown+` @@ -2156,6 +2156,12 @@ ** 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: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** Beschreibung: pass:none[color for text in "setname" messages] +** 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: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** Beschreibung: pass:none[ersetzt mirc Farben in Nachrichten mittels einer Hashtabelle: Schlüssel sind "fg,bg" als Ganzzahl zwischen -1 (nicht näher bezeichnet) und 15. Als Wert ist der Farbname oder die Farbnummer von WeeChat möglich (Format: "1,-1:Farbe1;2,7:Farbe2"), Beispiel: "1,-1:darkgray;1,2:white,blue" ersetzt schwarz durch "darkgray" und schwarz auf blau durch "white,blue"; Tabelle der Standard-IRC-Farben von WeeChat (in Klammern der Farbname, wie er von WeeChat genutzt wird): 0=weiß (white), 1=schwarz (black), 2=blau (blue), 3=grün (green), 4=hellrot (lightred), 5=rot (red), 6=violett (magenta), 7=braun (brown), 8=gelb (yellow), 9= hell-grün (lightgreen), 10=türkis (cyan), 11=hell-türkis (lightcyan), 12=hellblau (lightblue), 13=hell-violett (lightmagenta), 14=dunkel-grau (darkgray), 15=grau (gray)] ** Typ: Zeichenkette @@ -2552,6 +2558,12 @@ ** Werte: on, off ** Standardwert: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** Beschreibung: pass:none[enable smart filter for "setname" messages] +** Typ: boolesch +** Werte: on, off +** Standardwert: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** Beschreibung: pass:none[aktiviert die Erstellung von temporären Servern mit dem Befehl /connect] ** Typ: boolesch diff --git a/doc/en/includes/autogen_user_options.en.adoc b/doc/en/includes/autogen_user_options.en.adoc index ea9c990c9..37c0218ba 100644 --- a/doc/en/includes/autogen_user_options.en.adoc +++ b/doc/en/includes/autogen_user_options.en.adoc @@ -2133,7 +2133,7 @@ ** default value: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** description: pass:none[color for text in chghost messages] +** description: pass:none[color for text in "chghost" messages] ** 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: `+brown+` @@ -2156,6 +2156,12 @@ ** 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: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** description: pass:none[color for text in "setname" messages] +** 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: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** description: pass:none[remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray] ** type: string @@ -2552,6 +2558,12 @@ ** values: on, off ** default value: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** description: pass:none[enable smart filter for "setname" messages] +** type: boolean +** values: on, off +** default value: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** description: pass:none[enable automatic addition of temporary servers with command /connect] ** type: boolean diff --git a/doc/fr/includes/autogen_user_options.fr.adoc b/doc/fr/includes/autogen_user_options.fr.adoc index b6afd98e7..8b578cb93 100644 --- a/doc/fr/includes/autogen_user_options.fr.adoc +++ b/doc/fr/includes/autogen_user_options.fr.adoc @@ -2133,7 +2133,7 @@ ** valeur par défaut: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** description: pass:none[couleur pour le texte dans les messages chghost] +** description: pass:none[couleur pour le texte dans les messages "chghost"] ** 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: `+brown+` @@ -2156,6 +2156,12 @@ ** 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: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** description: pass:none[couleur pour le texte dans les messages "setname"] +** 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: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** description: pass:none[réassigner les couleurs mirc dans les messages en utilisant une table de hachage : les clés sont "fg,bg" sous forme d'entiers entre -1 (non spécifié) et 15, les valeurs sont des noms de couleur WeeChat ou nombres (le format est : "1,-1:couleur1;2,7:couleur2"), exemple : "1,-1:darkgray;1,2:white,blue" pour réassigner le noir en "darkgray" et le noir sur bleu en "white,blue" ; les couleurs WeeChat par défaut pour les codes IRC sont : 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray] ** type: chaîne @@ -2552,6 +2558,12 @@ ** valeurs: on, off ** valeur par défaut: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** description: pass:none[activer le filtre intelligent pour les messages "setname"] +** type: booléen +** valeurs: on, off +** valeur par défaut: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** description: pass:none[activer l'ajout automatique des serveurs temporaires avec la commande /connect] ** type: booléen diff --git a/doc/it/includes/autogen_user_options.it.adoc b/doc/it/includes/autogen_user_options.it.adoc index 360e0be00..d12e16e8b 100644 --- a/doc/it/includes/autogen_user_options.it.adoc +++ b/doc/it/includes/autogen_user_options.it.adoc @@ -2133,7 +2133,7 @@ ** valore predefinito: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** descrizione: pass:none[color for text in chghost messages] +** descrizione: pass:none[color for text in "chghost" messages] ** 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: `+brown+` @@ -2156,6 +2156,12 @@ ** 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: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** descrizione: pass:none[color for text in "setname" messages] +** 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: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** descrizione: pass:none[remap mirc colors in messages using a hashtable: keys are "fg,bg" as integers between -1 (not specified) and 15, values are WeeChat color names or numbers (format is: "1,-1:color1;2,7:color2"), example: "1,-1:darkgray;1,2:white,blue" to remap black to "darkgray" and black on blue to "white,blue"; default WeeChat colors for IRC codes: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray] ** tipo: stringa @@ -2552,6 +2558,12 @@ ** valori: on, off ** valore predefinito: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** descrizione: pass:none[enable smart filter for "setname" messages] +** tipo: bool +** valori: on, off +** valore predefinito: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** descrizione: pass:none[enable automatic addition of temporary servers with command /connect] ** tipo: bool diff --git a/doc/ja/includes/autogen_user_options.ja.adoc b/doc/ja/includes/autogen_user_options.ja.adoc index e48071844..55630b8a9 100644 --- a/doc/ja/includes/autogen_user_options.ja.adoc +++ b/doc/ja/includes/autogen_user_options.ja.adoc @@ -2133,7 +2133,7 @@ ** デフォルト値: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** 説明: pass:none[chghost メッセージの色] +** 説明: pass:none[color for text in "chghost" messages] ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" ** デフォルト値: `+brown+` @@ -2156,6 +2156,12 @@ ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" ** デフォルト値: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** 説明: pass:none[color for text in "setname" messages] +** タイプ: 色 +** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、端末色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" +** デフォルト値: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** 説明: pass:none[メッセージに含まれる mirc の定義する色に対するマッピングをハッシュテーブルで変更: キーは "fg,bg" で -1 (指定無し) から 15 までの整数、値は WeeChat 色名か色番号 (書式: "1,-1:color1;2,7:color2")、例: "1,-1:darkgray;1,2:white,blue" はテキスト色が黒のものを "darkgray" に、背景色が青でテキスト色が黒のものを "white,blue" に変更; IRC コードに対するデフォルトの WeeChat 色は、0=白、1=黒、2=青、3=緑、4=ライトレッド、5=赤、6=赤紫、7=茶色、8=黄色、9=ライトグリーン、10=シアン、11=ライトシアン、12=ライトブルー、13=ライトマゼンタ、14=暗い灰色、15=灰色] ** タイプ: 文字列 @@ -2552,6 +2558,12 @@ ** 値: on, off ** デフォルト値: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** 説明: pass:none[enable smart filter for "setname" messages] +** タイプ: ブール +** 値: on, off +** デフォルト値: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** 説明: pass:none[/connect コマンドによる一時的なサーバの自動追加を有効化する] ** タイプ: ブール diff --git a/doc/pl/includes/autogen_user_options.pl.adoc b/doc/pl/includes/autogen_user_options.pl.adoc index 74849d25a..c4b2f075b 100644 --- a/doc/pl/includes/autogen_user_options.pl.adoc +++ b/doc/pl/includes/autogen_user_options.pl.adoc @@ -2133,7 +2133,7 @@ ** domyślna wartość: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** opis: pass:none[kolor tekstu w wiadomościach o zmianie hosta] +** opis: pass:none[color for text in "chghost" messages] ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie ** domyślna wartość: `+brown+` @@ -2156,6 +2156,12 @@ ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie ** domyślna wartość: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** opis: pass:none[color for text in "setname" messages] +** typ: kolor +** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie +** domyślna wartość: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** opis: pass:none[zamień kolory mirca w wiadomościach używając tablicy hashy: klucze to "fg,bg" przyjmują one wartości pomiędzy -1 (nie określono) a 15, wartości to nazwy lub numery kolorów WeeChat (format: "1,-1:kolor1;2,7:kolor2"), przykład: "1,-1:darkgray;1,2:white,blue" w celu przemapowania czarnego na "darkgray" oraz czarnego na niebieskim tle na "white,blue"; domyślne kolory WeeChat dla kodów IRC: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray] ** typ: ciąg @@ -2552,6 +2558,12 @@ ** wartości: on, off ** domyślna wartość: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** opis: pass:none[enable smart filter for "setname" messages] +** typ: bool +** wartości: on, off +** domyślna wartość: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** opis: pass:none[włącza tworzenie tymczasowych serwerów za pomocą komendy /connect] ** typ: bool diff --git a/doc/sr/includes/autogen_user_options.sr.adoc b/doc/sr/includes/autogen_user_options.sr.adoc index 9fbd4118e..e8c29e6dc 100644 --- a/doc/sr/includes/autogen_user_options.sr.adoc +++ b/doc/sr/includes/autogen_user_options.sr.adoc @@ -2133,7 +2133,7 @@ ** подразумевана вредност: `+cyan+` * [[option_irc.color.message_chghost]] *irc.color.message_chghost* -** опис: pass:none[боја за текст у chghost порукама] +** опис: pass:none[color for text in "chghost" messages] ** тип: боја ** вредности: име WeeChat боје (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), број terminal боје или алијас; испред боје су дозвољени атрибути (само за боју текста, не и за позадину): „*” за подебљано, „!” за обрнуто, „/” за курзив, „_” за подвучено ** подразумевана вредност: `+brown+` @@ -2156,6 +2156,12 @@ ** вредности: име WeeChat боје (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), број terminal боје или алијас; испред боје су дозвољени атрибути (само за боју текста, не и за позадину): „*” за подебљано, „!” за обрнуто, „/” за курзив, „_” за подвучено ** подразумевана вредност: `+red+` +* [[option_irc.color.message_setname]] *irc.color.message_setname* +** опис: pass:none[color for text in "setname" messages] +** тип: боја +** вредности: име WeeChat боје (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), број terminal боје или алијас; испред боје су дозвољени атрибути (само за боју текста, не и за позадину): „*” за подебљано, „!” за обрнуто, „/” за курзив, „_” за подвучено +** подразумевана вредност: `+brown+` + * [[option_irc.color.mirc_remap]] *irc.color.mirc_remap* ** опис: pass:none[ремапирање mirc боја у порукама користећи хеш табелу: кључеви су „fg,bg” као цели бројеви између -1 (није наведена) и 15, вредности су WeeChat имена или бројеви боја (формат је: „1,-1:боја1;2,7:боја2”), пример: „1,-1:darkgray;1,2:white,blue” да се црна ремапира на „darkgray” и црна на плавој позадини у „white,blue”; подразумеване WeeChat боје за IRC кодове: 0=white, 1=black, 2=blue, 3=green, 4=lightred, 5=red, 6=magenta, 7=brown, 8=yellow, 9=lightgreen, 10=cyan, 11=lightcyan, 12=lightblue, 13=lightmagenta, 14=darkgray, 15=gray] ** тип: стринг @@ -2552,6 +2558,12 @@ ** вредности: on, off ** подразумевана вредност: `+on+` +* [[option_irc.look.smart_filter_setname]] *irc.look.smart_filter_setname* +** опис: pass:none[enable smart filter for "setname" messages] +** тип: логичка +** вредности: on, off +** подразумевана вредност: `+on+` + * [[option_irc.look.temporary_servers]] *irc.look.temporary_servers* ** опис: pass:none[укључивање аутоматског додавања привремених сервера командом /connect] ** тип: логичка @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-06-18 16:11+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8939,6 +8939,12 @@ msgstr "povolit chytrý filtr pro \"nick\" zprávy (změny přezdívek)" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "povolit chytrý filter pro \"part\" a \"quit\" zprávy" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "povolit chytrý filter pro \"join\" zprávy" + #, fuzzy msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -8986,8 +8992,9 @@ msgstr "barva přípony přezdívky (přípona je uživatelský řetězec za př msgid "color for text in account messages" msgstr "barva textu vezprávách připojení" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "barva textu vezprávách připojení" msgid "color for text in join messages" @@ -9000,6 +9007,12 @@ msgstr "barva textu vezprávách připojení" msgid "color for text in part/quit messages" msgstr "barva textu ve zprávách odchodu/ukončení" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "barva textu vezprávách připojení" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -9553,11 +9566,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s skončil" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sSelhalo odnastavení volby \"%s\"" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s%s\"" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sSelhalo odnastavení volby \"%s\"" #, c-format @@ -13575,6 +13589,10 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sSelhalo odnastavení volby \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-08-08 10:21+0200\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -11137,6 +11137,12 @@ msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" "aktiviert einen intelligenten Filter für \"part\" und \"quit\" Nachrichten" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "aktiviert einen intelligenten Filter für \"join\" Nachrichten" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" "aktiviert die Erstellung von temporären Servern mit dem Befehl /connect" @@ -11189,7 +11195,10 @@ msgstr "" msgid "color for text in account messages" msgstr "Textfarbe für \"account\" Nachrichten" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +#, fuzzy +#| msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "Textfarbe in der chghost Nachrichten dargestellt werden" msgid "color for text in join messages" @@ -11207,6 +11216,14 @@ msgstr "" "Textfarbe in der die Meldungen für das Verlassen/Beenden eines Kanals " "angezeigt werden soll" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "" +"Textfarbe in der die Meldungen für das Betreten eines Kanals angezeigt " +"werden soll" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -11813,13 +11830,15 @@ msgstr "%s%s%s%s%s%s%s%s%s%s hat den IRC verlassen %s(%s%s%s)" msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s hat den IRC verlassen" -#, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sRealname wurde gesetzt auf: %s" +#, fuzzy, c-format +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s hat das Thema für den Kanal %s%s%s auf \"%s%s%s\" gesetzt" -#, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" -msgstr "%sRealname von %s%s%s wurde auf \"%s\" gesetzt" +#, fuzzy, c-format +#| msgid "%sYour real name has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" +msgstr "%sRealname wurde gesetzt auf: %s" #, c-format msgid "%s%s: \"%s\" command received without channel" @@ -16417,6 +16436,10 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" +#, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sRealname von %s%s%s wurde auf \"%s\" gesetzt" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-06-18 16:11+0200\n" "Last-Translator: Santiago Forero <santiago@forero.xyz>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9572,6 +9572,12 @@ msgstr "habilitar el filtro inteligente para mensajes \"nick\"" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "habilitar el filtro inteligente para mensajes \"part\" y \"quit\"" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "habilitar el filtro inteligente para mensajes \"join\"" + #, fuzzy msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -9623,8 +9629,9 @@ msgstr "" msgid "color for text in account messages" msgstr "color para el texto en mensajes de unión" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "color para el texto en mensajes de unión" msgid "color for text in join messages" @@ -9637,6 +9644,12 @@ msgstr "color para el texto en mensajes de unión" msgid "color for text in part/quit messages" msgstr "color para el texto en mensajes de salida/abandono" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "color para el texto en mensajes de unión" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string #, fuzzy msgid "" @@ -10215,11 +10228,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s ha salido" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sNo se pudo deshacer la opción \"%s\"" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s%s\"" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sNo se pudo deshacer la opción \"%s\"" #, c-format @@ -14193,6 +14207,10 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: no es posible conectarse: error (%d)" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sNo se pudo deshacer la opción \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" -"PO-Revision-Date: 2022-08-07 16:40+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" +"PO-Revision-Date: 2022-08-13 22:43+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -10917,6 +10917,10 @@ msgstr "" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "activer le filtre intelligent pour les messages \"part\" et \"quit\"" +#. TRANSLATORS: please do not translate "setname" +msgid "enable smart filter for \"setname\" messages" +msgstr "activer le filtre intelligent pour les messages \"setname\"" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" "activer l'ajout automatique des serveurs temporaires avec la commande /" @@ -10966,8 +10970,9 @@ msgstr "" msgid "color for text in account messages" msgstr "couleur pour le texte dans les messages account" -msgid "color for text in chghost messages" -msgstr "couleur pour le texte dans les messages chghost" +#. TRANSLATORS: please do not translate "chghost" +msgid "color for text in \"chghost\" messages" +msgstr "couleur pour le texte dans les messages \"chghost\"" msgid "color for text in join messages" msgstr "couleur pour le texte dans les messages join" @@ -10978,6 +10983,10 @@ msgstr "couleur pour le texte dans les messages kick/kill" msgid "color for text in part/quit messages" msgstr "couleur pour le texte dans les messages part/quit" +#. TRANSLATORS: please do not translate "setname" +msgid "color for text in \"setname\" messages" +msgstr "couleur pour le texte dans les messages \"setname\"" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -11568,12 +11577,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s a quitté" #, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sVotre nom réel a été défini à \"%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s a changé le nom réel en %s\"%s%s%s\"%s" #, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" -msgstr "%sLe nom réel de %s%s%s a été défini à \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" +msgstr "%s%sVotre nom réel a été défini à %s\"%s%s%s\"%s" #, c-format msgid "%s%s: \"%s\" command received without channel" @@ -16006,5 +16015,9 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" +#, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sLe nom réel de %s%s%s a été défini à \"%s\"" + #~ msgid "WeeChat session saved" #~ msgstr "Session WeeChat sauvegardée" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8446,6 +8446,11 @@ msgstr "új üzenetet tartalmazó ablak színe" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +msgid "enable smart filter for \"setname\" messages" +msgstr "új üzenetet tartalmazó ablak színe" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -8488,8 +8493,9 @@ msgstr "névkiegészítés után beszúrt szöveg" msgid "color for text in account messages" msgstr "új üzenetet tartalmazó ablak színe" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "új üzenetet tartalmazó ablak színe" #, fuzzy @@ -8504,6 +8510,11 @@ msgstr "új üzenetet tartalmazó ablak színe" msgid "color for text in part/quit messages" msgstr "alapértelmezett kilépő üzenet" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +msgid "color for text in \"setname\" messages" +msgstr "új üzenetet tartalmazó ablak színe" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -9069,11 +9080,11 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s %s(%s%s%s)%s kilépett" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%s nem sikerült a modul opciókat elmenteni\n" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%s nem sikerült a modul opciókat elmenteni\n" #, fuzzy, c-format @@ -12941,6 +12952,10 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%s nem sikerült a modul opciókat elmenteni\n" + #, fuzzy #~ msgid "WeeChat session saved" #~ msgstr "WeeChat szlogen" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9363,6 +9363,12 @@ msgstr "" "abilita filtro smart per i messaggi \"part\" (uscita) e \"quit " "(disconnessione)" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "abilita filtro smart per i messaggi \"join\" (entrata)" + #, fuzzy msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -9419,8 +9425,9 @@ msgstr "" msgid "color for text in account messages" msgstr "colore per il testo nei messaggi di entrata" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "colore per il testo nei messaggi di entrata" msgid "color for text in join messages" @@ -9433,6 +9440,12 @@ msgstr "colore per il testo nei messaggi di entrata" msgid "color for text in part/quit messages" msgstr "colore per il testo nei messaggi di uscita/abbandono" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "colore per il testo nei messaggi di entrata" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string #, fuzzy msgid "" @@ -10012,11 +10025,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s si è disconnesso" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sImpossibile disabilitare l'opzione \"%s\"" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s%s\"" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sImpossibile disabilitare l'opzione \"%s\"" #, c-format @@ -14011,6 +14025,10 @@ msgstr "%s%s: timeout per \"%s\" con %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: impossibile connettersi al mittente" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sImpossibile disabilitare l'opzione \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-06-18 16:12+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -10361,6 +10361,12 @@ msgstr "" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "\"part\" と \"quit\" メッセージのスマートフィルタを有効化" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "\"join\" メッセージのスマートフィルタを有効化" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "/connect コマンドによる一時的なサーバの自動追加を有効化する" @@ -10403,7 +10409,10 @@ msgstr "\"input_prompt\" バー要素内のニックネームモードに付け msgid "color for text in account messages" msgstr "参加メッセージの色" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +#, fuzzy +#| msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "chghost メッセージの色" msgid "color for text in join messages" @@ -10416,6 +10425,12 @@ msgstr "参加メッセージの色" msgid "color for text in part/quit messages" msgstr "退出/終了 メッセージの色" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "参加メッセージの色" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -10995,11 +11010,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s が終了" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sオプション \"%s\" の無効化に失敗しました" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s が %s%s%s のトピックを変更、\"%s%s%s\" になりました" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sオプション \"%s\" の無効化に失敗しました" #, c-format @@ -15216,6 +15232,10 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sオプション \"%s\" の無効化に失敗しました" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-06-18 16:12+0200\n" "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -10915,6 +10915,12 @@ msgstr "włącza mądre filtrowanie dla wiadomości \"nick\" (zmiana nicka)" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "włącza inteligentne filtrowanie dla wiadomości \"part\" oraz \"quit\"" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "włącza mądre filtrowanie dla wiadomości \"join\"" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "włącza tworzenie tymczasowych serwerów za pomocą komendy /connect" @@ -10953,7 +10959,10 @@ msgstr "" msgid "color for text in account messages" msgstr "kolor tekstu w wiadomościach konta" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +#, fuzzy +#| msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "kolor tekstu w wiadomościach o zmianie hosta" msgid "color for text in join messages" @@ -10965,6 +10974,12 @@ msgstr "kolor tekstu w wiadomości kick/kill" msgid "color for text in part/quit messages" msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "kolor tekstu w wiadomościach o wejściu na kanał" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -11551,13 +11566,15 @@ msgstr "%s%s%s%s%s%s%s%s%s%s wyszedł z IRC %s(%s%s%s)" msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s wyszedł z IRC" -#, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sUstawiono twój real name na \"%s\"" +#, fuzzy, c-format +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s zmienił temat kanału %s%s%s na \"%s%s%s\"" -#, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" -msgstr "%sReal name dla %s%s%s zostało zmienione na \"%s\"" +#, fuzzy, c-format +#| msgid "%sYour real name has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" +msgstr "%sUstawiono twój real name na \"%s\"" #, c-format msgid "%s%s: \"%s\" command received without channel" @@ -15979,6 +15996,10 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" +#, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sReal name dla %s%s%s zostało zmienione na \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-06-18 16:12+0200\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -10162,6 +10162,12 @@ msgstr "ativar filtro inteligente para mensagens \"nick\" (mudanças de nick)" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "ativar filtro inteligente para mensagens \"part\" e \"quit\"" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "ativar filtro inteligente de mensagens de \"join\"" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" "ativar adição automática de servidores temporários pelo comando /connect" @@ -10205,8 +10211,9 @@ msgstr "cor dos modos de nick no item de barra \"input_prompt\"" msgid "color for text in account messages" msgstr "cor do texto das mensagens de join" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "cor do texto das mensagens de join" msgid "color for text in join messages" @@ -10219,6 +10226,12 @@ msgstr "cor do texto das mensagens de join" msgid "color for text in part/quit messages" msgstr "cor do texto das mensagens de part/quit" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "cor do texto das mensagens de join" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string #, fuzzy msgid "" @@ -10814,11 +10827,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s saiu" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sFalha ao reinicializar a opção \"%s\"" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s mudou o tópico de %s%s%s para \"%s%s%s\"" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sFalha ao reinicializar a opção \"%s\"" #, c-format @@ -15060,6 +15074,10 @@ msgstr "%s%s: tempo limite de \"%s\" com %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar: erro inesperado (%d)" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sFalha ao reinicializar a opção \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" diff --git a/po/pt_BR.po b/po/pt_BR.po index eb514c3cf..86b4d6b81 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: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8920,6 +8920,10 @@ msgstr "" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +msgid "enable smart filter for \"setname\" messages" +msgstr "" + #, fuzzy msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -8967,8 +8971,9 @@ msgstr "" msgid "color for text in account messages" msgstr "cor de texto para valores" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "cor de texto para valores" msgid "color for text in join messages" @@ -8981,6 +8986,11 @@ msgstr "cor de texto para valores" msgid "color for text in part/quit messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +msgid "color for text in \"setname\" messages" +msgstr "cor de texto para valores" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -9540,11 +9550,12 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sFalhou ao desabilitar a opção \"%s\"" +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s mudou o tópico do canal %s%s%s para \"%s%s%s\"" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%sFalhou ao desabilitar a opção \"%s\"" #, c-format @@ -13462,6 +13473,10 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar ao remetente" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sFalhou ao desabilitar a opção \"%s\"" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-04-24 10:20+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8478,6 +8478,11 @@ msgstr "цвет текущего окна с сообщениями" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +msgid "enable smart filter for \"setname\" messages" +msgstr "цвет текущего окна с сообщениями" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -8520,8 +8525,9 @@ msgstr "строка, вставляемая после автодополнен msgid "color for text in account messages" msgstr "цвет текущего окна с сообщениями" +#. TRANSLATORS: please do not translate "chghost" #, fuzzy -msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "цвет текущего окна с сообщениями" #, fuzzy @@ -8536,6 +8542,11 @@ msgstr "цвет текущего окна с сообщениями" msgid "color for text in part/quit messages" msgstr "сообщение о выходе по-умолчанию" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +msgid "color for text in \"setname\" messages" +msgstr "цвет текущего окна с сообщениями" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -9106,11 +9117,11 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s %s(%s%s%s)%s вышел" #, fuzzy, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%s не могу сохранить конфигурационный файл pluginов\n" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s сменил тему %s%s%s на:" #, fuzzy, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "%s не могу сохранить конфигурационный файл pluginов\n" #, fuzzy, c-format @@ -12975,6 +12986,10 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" +#, fuzzy, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%s не могу сохранить конфигурационный файл pluginов\n" + #, fuzzy #~ msgid "WeeChat session saved" #~ msgstr "слоган WeeChat" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-07-06 08:29+0400\n" "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10767,6 +10767,12 @@ msgstr "укључивање паметног филтера за „nick” п msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "укључивање паметног филтера за „part” и „quit” поруке" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "укључивање паметног филтера за „join” поруке" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "укључивање аутоматског додавања привремених сервера командом /connect" @@ -10805,7 +10811,10 @@ msgstr "боја за више подржане TLS верзије у ставк msgid "color for text in account messages" msgstr "боја за текст у account порукама" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +#, fuzzy +#| msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "боја за текст у chghost порукама" msgid "color for text in join messages" @@ -10817,6 +10826,12 @@ msgstr "боја за текст у kick/kill порукама" msgid "color for text in part/quit messages" msgstr "боја за текст у part/quit порукама" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "боја за текст у join порукама" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -11396,13 +11411,15 @@ msgstr "%s%s%s%s%s%s%s%s%s%s је прекинуо %s(%s%s%s)" msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s је прекинуо" -#, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sВаше право име је постављено на „%s”" +#, fuzzy, c-format +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s је променио тему за канал %s%s%s на „%s%s%s”" -#, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" -msgstr "%sРеално име за %s%s%s је постављено на „%s”" +#, fuzzy, c-format +#| msgid "%sYour real name has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" +msgstr "%sВаше право име је постављено на „%s”" #, c-format msgid "%s%s: \"%s\" command received without channel" @@ -15821,6 +15838,10 @@ msgstr "%s%s: тајмаут за „%s” са %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: повезивање није успело: неочекивана грешка (%d)" +#, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%sРеално име за %s%s%s је постављено на „%s”" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2022-07-27 23:00+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10550,6 +10550,12 @@ msgstr "" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "\"part\" ve \"quit\" iletileri için akıllı süzgeci etkinleştir" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "enable smart filter for \"join\" messages" +msgid "enable smart filter for \"setname\" messages" +msgstr "\"join\" iletileri için akıllı süzgeci etkinleştir" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" "/connect komutu ile geçici sunucuların kendiliğinden eklenmesini etkinleştir" @@ -10590,7 +10596,10 @@ msgstr "" msgid "color for text in account messages" msgstr "hesap iletilerindeki metin rengi" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +#, fuzzy +#| msgid "color for text in chghost messages" +msgid "color for text in \"chghost\" messages" msgstr "chghost iletilerindeki metin rengi" msgid "color for text in join messages" @@ -10602,6 +10611,12 @@ msgstr "kov/öldür iletilerindeki metin rengi" msgid "color for text in part/quit messages" msgstr "ayrılma/çıkış iletisindeki metin için renk" +#. TRANSLATORS: please do not translate "setname" +#, fuzzy +#| msgid "color for text in join messages" +msgid "color for text in \"setname\" messages" +msgstr "Bağlanma iletisi metni için renk" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -11178,13 +11193,15 @@ msgstr "%s%s%s%s%s%s%s%s%s%s, çıktı %s(%s%s%s)" msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s%s%s%s%s%s%s%s%s, çıktı" -#, c-format -msgid "%sYour real name has been set to \"%s\"" -msgstr "%sGerçek adınız \"%s\" olarak ayarlandı" +#, fuzzy, c-format +#| msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" +msgstr "%s%s%s%s, %s%s%s için konuyu \"%s%s%s\" olarak değiştirdi" -#, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" -msgstr "%s%s%s%s kullanıcısının gerçek adı \"%s\" olarak ayarlandı" +#, fuzzy, c-format +#| msgid "%sYour real name has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" +msgstr "%sGerçek adınız \"%s\" olarak ayarlandı" #, c-format msgid "%s%s: \"%s\" command received without channel" @@ -15550,6 +15567,10 @@ msgstr "%s%s: \"%s\" için %s ile zaman aşımı" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: Bağlanılamıyor: Beklenmedik hata (%d)" +#, c-format +#~ msgid "%sReal name of %s%s%s has been set to \"%s\"" +#~ msgstr "%s%s%s%s kullanıcısının gerçek adı \"%s\" olarak ayarlandı" + #, fuzzy #~| msgid "WeeChat version" #~ msgid "WeeChat session saved" diff --git a/po/weechat.pot b/po/weechat.pot index e6e19134f..fad81dfd6 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-08-13 18:51+0200\n" +"POT-Creation-Date: 2022-08-13 22:39+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7567,6 +7567,10 @@ msgstr "" msgid "enable smart filter for \"part\" and \"quit\" messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +msgid "enable smart filter for \"setname\" messages" +msgstr "" + msgid "enable automatic addition of temporary servers with command /connect" msgstr "" @@ -7602,7 +7606,8 @@ msgstr "" msgid "color for text in account messages" msgstr "" -msgid "color for text in chghost messages" +#. TRANSLATORS: please do not translate "chghost" +msgid "color for text in \"chghost\" messages" msgstr "" msgid "color for text in join messages" @@ -7614,6 +7619,10 @@ msgstr "" msgid "color for text in part/quit messages" msgstr "" +#. TRANSLATORS: please do not translate "setname" +msgid "color for text in \"setname\" messages" +msgstr "" + #. TRANSLATORS: please do not translate the list of WeeChat color names at the end of string msgid "" "remap mirc colors in messages using a hashtable: keys are \"fg,bg\" as " @@ -8134,11 +8143,11 @@ msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "" #, c-format -msgid "%sYour real name has been set to \"%s\"" +msgid "%s%s%s%s has changed real name to %s\"%s%s%s\"%s" msgstr "" #, c-format -msgid "%sReal name of %s%s%s has been set to \"%s\"" +msgid "%s%sYour real name has been set to %s\"%s%s%s\"%s" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index f1b9a760b..cde58d8a0 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -1176,7 +1176,7 @@ irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel, const char *nick) { int i, unmask_delay, length_tags, nick_found, join, account; - int chghost, nick_changed, smart_filtered, remove_smart_filter; + int chghost, setname, nick_changed, smart_filtered, remove_smart_filter; time_t *ptr_time, date_min; struct t_hdata *hdata_line, *hdata_line_data; struct t_gui_line *own_lines; @@ -1254,6 +1254,7 @@ irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel, join = 0; account = 0; chghost = 0; + setname = 0; nick_changed = 0; irc_nick1 = NULL; irc_nick2 = NULL; @@ -1271,6 +1272,8 @@ irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel, account = 1; else if (strcmp (tags[i], "irc_chghost") == 0) chghost = 1; + else if (strcmp (tags[i], "irc_setname") == 0) + setname = 1; else if (strcmp (tags[i], "irc_nick") == 0) nick_changed = 1; else if (strncmp (tags[i], "irc_nick1_", 10) == 0) @@ -1294,7 +1297,8 @@ irc_channel_join_smart_filtered_unmask (struct t_irc_channel *channel, break; remove_smart_filter = 1; } - else if (nick_found && (join || account || chghost) && smart_filtered) + else if (nick_found && (join || account || chghost || setname) + && smart_filtered) { remove_smart_filter = 1; } diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index 16c96c28b..bfa09b84a 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -88,6 +88,7 @@ #define IRC_COLOR_MESSAGE_CHGHOST weechat_color(weechat_config_string(irc_config_color_message_chghost)) #define IRC_COLOR_MESSAGE_KICK weechat_color(weechat_config_string(irc_config_color_message_kick)) #define IRC_COLOR_MESSAGE_QUIT weechat_color(weechat_config_string(irc_config_color_message_quit)) +#define IRC_COLOR_MESSAGE_SETNAME weechat_color(weechat_config_string(irc_config_color_message_setname)) #define IRC_COLOR_REASON_KICK weechat_color(weechat_config_string(irc_config_color_reason_kick)) #define IRC_COLOR_REASON_QUIT weechat_color(weechat_config_string(irc_config_color_reason_quit)) #define IRC_COLOR_TOPIC_CURRENT weechat_color(weechat_config_string(irc_config_color_topic_current)) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 716aebb90..c989120cd 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -110,6 +110,7 @@ struct t_config_option *irc_config_look_smart_filter_join_unmask; struct t_config_option *irc_config_look_smart_filter_mode; struct t_config_option *irc_config_look_smart_filter_nick; struct t_config_option *irc_config_look_smart_filter_quit; +struct t_config_option *irc_config_look_smart_filter_setname; struct t_config_option *irc_config_look_temporary_servers; struct t_config_option *irc_config_look_topic_strip_colors; @@ -129,6 +130,7 @@ struct t_config_option *irc_config_color_message_chghost; struct t_config_option *irc_config_color_message_join; struct t_config_option *irc_config_color_message_kick; struct t_config_option *irc_config_color_message_quit; +struct t_config_option *irc_config_color_message_setname; struct t_config_option *irc_config_color_mirc_remap; struct t_config_option *irc_config_color_nick_prefixes; struct t_config_option *irc_config_color_notice; @@ -3234,6 +3236,13 @@ irc_config_init () N_("enable smart filter for \"part\" and \"quit\" messages"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_smart_filter_setname = weechat_config_new_option ( + irc_config_file, ptr_section, + "smart_filter_setname", "boolean", + /* TRANSLATORS: please do not translate "setname" */ + N_("enable smart filter for \"setname\" messages"), + NULL, 0, 0, "on", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_temporary_servers = weechat_config_new_option ( irc_config_file, ptr_section, "temporary_servers", "boolean", @@ -3339,7 +3348,8 @@ irc_config_init () irc_config_color_message_chghost = weechat_config_new_option ( irc_config_file, ptr_section, "message_chghost", "color", - N_("color for text in chghost messages"), + /* TRANSLATORS: please do not translate "chghost" */ + N_("color for text in \"chghost\" messages"), NULL, -1, 0, "brown", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_color_message_join = weechat_config_new_option ( @@ -3360,6 +3370,13 @@ irc_config_init () N_("color for text in part/quit messages"), NULL, -1, 0, "red", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_color_message_setname = weechat_config_new_option ( + irc_config_file, ptr_section, + "message_setname", "color", + /* TRANSLATORS: please do not translate "setname" */ + N_("color for text in \"setname\" messages"), + NULL, -1, 0, "brown", NULL, 0, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_color_mirc_remap = weechat_config_new_option ( irc_config_file, ptr_section, "mirc_remap", "string", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index ea05d98b4..570b22b85 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -150,6 +150,7 @@ extern struct t_config_option *irc_config_look_smart_filter_join_unmask; extern struct t_config_option *irc_config_look_smart_filter_mode; extern struct t_config_option *irc_config_look_smart_filter_nick; extern struct t_config_option *irc_config_look_smart_filter_quit; +extern struct t_config_option *irc_config_look_smart_filter_setname; extern struct t_config_option *irc_config_look_temporary_servers; extern struct t_config_option *irc_config_look_topic_strip_colors; @@ -166,6 +167,7 @@ extern struct t_config_option *irc_config_color_message_chghost; extern struct t_config_option *irc_config_color_message_join; extern struct t_config_option *irc_config_color_message_kick; extern struct t_config_option *irc_config_color_message_quit; +extern struct t_config_option *irc_config_color_message_setname; extern struct t_config_option *irc_config_color_mirc_remap; extern struct t_config_option *irc_config_color_nick_prefixes; extern struct t_config_option *irc_config_color_notice; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 4af1b0e31..f19b95c51 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3059,9 +3059,10 @@ IRC_PROTOCOL_CALLBACK(quit) IRC_PROTOCOL_CALLBACK(setname) { - int local_setname; + int local_setname, setname_enabled, smart_filter; struct t_irc_channel *ptr_channel; struct t_irc_nick *ptr_nick; + struct t_irc_channel_speaking *ptr_nick_speaking; char *str_realname, *realname_color; IRC_PROTOCOL_MIN_PARAMS(1); @@ -3073,53 +3074,105 @@ IRC_PROTOCOL_CALLBACK(setname) if (!str_realname) return WEECHAT_RC_ERROR; - if (weechat_hashtable_has_key (server->cap_list, "setname")) + realname_color = irc_color_decode ( + str_realname, + weechat_config_boolean (irc_config_network_colors_receive)); + + setname_enabled = (weechat_hashtable_has_key (server->cap_list, "setname")); + + for (ptr_channel = server->channels; ptr_channel; + ptr_channel = ptr_channel->next_channel) { - for (ptr_channel = server->channels; ptr_channel; - ptr_channel = ptr_channel->next_channel) + switch (ptr_channel->type) { - ptr_nick = irc_nick_search (server, ptr_channel, nick); - if (ptr_nick) - { - if (ptr_nick->realname) - free (ptr_nick->realname); - ptr_nick->realname = strdup (str_realname); - } + case IRC_CHANNEL_TYPE_PRIVATE: + if (!ignored + && !local_setname + && (irc_server_strcasecmp (server, + ptr_channel->name, nick) == 0)) + { + weechat_printf_date_tags ( + irc_msgbuffer_get_target_buffer ( + server, NULL, command, NULL, ptr_channel->buffer), + date, + irc_protocol_tags (command, tags, NULL, NULL, NULL), + _("%s%s%s%s has changed real name to %s\"%s%s%s\"%s"), + weechat_prefix ("network"), + irc_nick_color_for_msg (server, 1, NULL, nick), + nick, + IRC_COLOR_MESSAGE_SETNAME, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + (realname_color) ? realname_color : "", + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET); + } + break; + case IRC_CHANNEL_TYPE_CHANNEL: + ptr_nick = irc_nick_search (server, ptr_channel, nick); + if (ptr_nick) + { + if (!ignored && !local_setname) + { + ptr_nick_speaking = ((weechat_config_boolean (irc_config_look_smart_filter)) + && (weechat_config_boolean (irc_config_look_smart_filter_setname))) ? + irc_channel_nick_speaking_time_search (server, ptr_channel, nick, 1) : NULL; + smart_filter = (!local_setname + && weechat_config_boolean (irc_config_look_smart_filter) + && weechat_config_boolean (irc_config_look_smart_filter_setname) + && !ptr_nick_speaking); + + weechat_printf_date_tags ( + irc_msgbuffer_get_target_buffer ( + server, NULL, command, NULL, ptr_channel->buffer), + date, + irc_protocol_tags ( + command, + tags, + smart_filter ? "irc_smart_filter" : NULL, + NULL, + NULL), + _("%s%s%s%s has changed real name to %s\"%s%s%s\"%s"), + weechat_prefix ("network"), + irc_nick_color_for_msg (server, 1, NULL, nick), + nick, + IRC_COLOR_MESSAGE_SETNAME, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + (realname_color) ? realname_color : "", + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET); + } + if (setname_enabled) + { + if (ptr_nick->realname) + free (ptr_nick->realname); + ptr_nick->realname = strdup (str_realname); + } + } + break; } } - if (!ignored) + if (!ignored && local_setname) { - realname_color = irc_color_decode ( - str_realname, - weechat_config_boolean (irc_config_network_colors_receive)); - if (local_setname) - { - weechat_printf_date_tags ( - irc_msgbuffer_get_target_buffer (server, NULL, command, NULL, NULL), - date, - irc_protocol_tags (command, tags, NULL, NULL, NULL), - _("%sYour real name has been set to \"%s\""), - weechat_prefix ("network"), - (realname_color) ? realname_color : ""); - } - else - { - weechat_printf_date_tags ( - irc_msgbuffer_get_target_buffer (server, NULL, command, NULL, NULL), - date, - irc_protocol_tags (command, tags, NULL, NULL, NULL), - _("%sReal name of %s%s%s has been set to \"%s\""), - weechat_prefix ("network"), - irc_nick_color_for_msg (server, 1, NULL, nick), - nick, - IRC_COLOR_RESET, - (realname_color) ? realname_color : ""); - } - if (realname_color) - free (realname_color); + weechat_printf_date_tags ( + irc_msgbuffer_get_target_buffer (server, NULL, command, NULL, NULL), + date, + irc_protocol_tags (command, tags, NULL, NULL, NULL), + _("%s%sYour real name has been set to %s\"%s%s%s\"%s"), + weechat_prefix ("network"), + IRC_COLOR_MESSAGE_SETNAME, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + (realname_color) ? realname_color : "", + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET); } + if (realname_color) + free (realname_color); + free (str_realname); return WEECHAT_RC_OK; diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index 7240cd461..55098a96f 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -1847,7 +1847,7 @@ TEST(IrcProtocolWithServer, setname_without_setname_cap) /* real name of "bob" has changed */ RECV(":bob!user@host SETNAME :new bob realname "); - CHECK_SRV("-- Real name of bob has been set to \"new bob realname \""); + CHECK_CHAN("-- bob has changed real name to \"new bob realname \""); POINTERS_EQUAL(NULL, ptr_nick->realname); /* self real name has changed */ @@ -1863,21 +1863,29 @@ TEST(IrcProtocolWithServer, setname_without_setname_cap) TEST(IrcProtocolWithServer, setname_with_setname_cap) { - struct t_irc_nick *ptr_nick; + struct t_irc_nick *ptr_nick, *ptr_nick2; /* assume "setname" capability is enabled in server */ hashtable_set (ptr_server->cap_list, "setname", NULL); - SRV_INIT_JOIN; + SRV_INIT_JOIN2; ptr_nick = ptr_server->channels->nicks; + ptr_nick2 = ptr_server->channels->last_nick; POINTERS_EQUAL(NULL, ptr_nick->realname); + /* real name of "bob" has changed */ + RECV(":bob!user@host SETNAME :new bob realname "); + CHECK_CHAN("-- bob has changed real name to \"new bob realname \""); + STRCMP_EQUAL("new bob realname ", ptr_nick2->realname); + + /* self real name has changed */ RECV(":alice!user@host SETNAME :new realname"); CHECK_SRV("-- Your real name has been set to \"new realname\""); STRCMP_EQUAL("new realname", ptr_nick->realname); + /* self real name has changed */ RECV(":alice!user@host SETNAME :new realname2"); CHECK_SRV("-- Your real name has been set to \"new realname2\""); STRCMP_EQUAL("new realname2", ptr_nick->realname); |