diff options
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | doc/de/autogen/user/weechat_commands.adoc | 82 | ||||
| -rw-r--r-- | doc/en/autogen/user/weechat_commands.adoc | 2 | ||||
| -rw-r--r-- | doc/fr/autogen/user/weechat_commands.adoc | 2 | ||||
| -rw-r--r-- | doc/it/autogen/user/weechat_commands.adoc | 2 | ||||
| -rw-r--r-- | doc/ja/autogen/user/weechat_commands.adoc | 88 | ||||
| -rw-r--r-- | doc/pl/autogen/user/weechat_commands.adoc | 76 | ||||
| -rw-r--r-- | po/cs.po | 6 | ||||
| -rw-r--r-- | po/de.po | 7 | ||||
| -rw-r--r-- | po/es.po | 6 | ||||
| -rw-r--r-- | po/fr.po | 12 | ||||
| -rw-r--r-- | po/hu.po | 6 | ||||
| -rw-r--r-- | po/it.po | 6 | ||||
| -rw-r--r-- | po/ja.po | 7 | ||||
| -rw-r--r-- | po/pl.po | 7 | ||||
| -rw-r--r-- | po/pt.po | 7 | ||||
| -rw-r--r-- | po/pt_BR.po | 6 | ||||
| -rw-r--r-- | po/ru.po | 6 | ||||
| -rw-r--r-- | po/tr.po | 6 | ||||
| -rw-r--r-- | po/weechat.pot | 6 | ||||
| -rw-r--r-- | src/core/wee-command.c | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 12 | ||||
| -rw-r--r-- | src/plugins/irc/irc-ctcp.c | 25 | ||||
| -rw-r--r-- | src/plugins/irc/irc-input.c | 4 | ||||
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 2 |
25 files changed, 199 insertions, 189 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index fca848ddd..4c20a966b 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -22,6 +22,7 @@ New features:: * api: add info "pid" (WeeChat PID) (issue #850) * fifo: add file fifo.conf and option fifo.file.path to customize FIFO pipe path/filename (issue #850) + * irc: add tag "self_msg" on self messages (issue #840) Improvements:: diff --git a/doc/de/autogen/user/weechat_commands.adoc b/doc/de/autogen/user/weechat_commands.adoc index 4f02de886..24d200856 100644 --- a/doc/de/autogen/user/weechat_commands.adoc +++ b/doc/de/autogen/user/weechat_commands.adoc @@ -332,57 +332,57 @@ Beispiele (Bedingungen): rename <name> <new_name> del <name>|-all - list: alle Filter auflisten - enable: Filter wird aktiviert (Filter werden standardmäßig aktiviert) -disable: Filter deaktivieren - toggle: Filter umschalten - name: Name des Filters ("@" = aktiviert/deaktiviert alle Filter im aktuellen Buffer) - add: Filter hinzufügen - rename: benennt einen Filter um - del: Filter entfernen - -all: entfernt alle Filter - buffer: durch Kommata getrennte Liste von Buffer in denen der Filter aktiv sein soll: - - ist der vollständige Name eines Buffer inklusive seiner Erweiterung (Beispiel: "irc.freenode.#weechat") - - "*" bedeutet, alle Buffer - - beginnt ein Name mit '!' wird für diesen Buffer kein Filter genutzt - - Platzhalter "*" kann verwendet werden - tags: durch Kommata getrennte Liste von Schlagwörtern. Zum Beispiel: "irc_join,irc_part,irc_quit" - - logisch "und": mittels "+" zwischen den Tags (zum Beispiel: "nick_toto+irc_action") - - Platzhalter "*" kann verwendet werden - - wird ein Tag mit '!' eingeleitet, dann muss dieser Tag NICHT in der Nachricht enthalten sein - regex: erweiterter regulärer POSIX Ausdruck, um in einer Zeile zu suchen - - das Präfix (z.B. Nick) wird mittels '\t' von der Nachricht getrennt. Sonderzeichen wie '|' müssen mit einer Escapesequenz : '\|' eingebunden werden) - - wird ein regulärer Ausdruck mit '!' eingeleitet dann wird das übereinstimmende Ergebnis umgekehrt (nutze '\!' um mit '!' zu beginnen) - - es werden zwei reguläre Ausdrücke erstellt: Der erste für den Präfix und der zweite für die eigentliche Nachricht - - reguläre Ausdrücke unterscheiden nicht zwischen Groß- und Kleinschreibung. Um zwischen Groß- und Kleinschreibung zu unterscheiden müssen diese mit "(?-i)" eingeleitet werden. - -Mit der Tastenvoreinstellung alt+'=' kann die Filterfunktion (de-)aktiviert werden. - -Die am häufigsten gebrauchten Schlagwörter lauten: - no_filter, no_highlight, no_log, log0..log9 (log Level), + list: list all filters + enable: enable filters (filters are enabled by default) +disable: disable filters + toggle: toggle filters + name: filter name ("@" = enable/disable all filters in current buffer) + add: add a filter + rename: rename a filter + del: delete a filter + -all: delete all filters + buffer: comma separated list of buffers where filter is active: + - this is full name including plugin (example: "irc.freenode.#weechat" or "irc.server.freenode") + - "*" means all buffers + - a name starting with '!' is excluded + - wildcard "*" is allowed + tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit" + - logical "and": use "+" between tags (for example: "nick_toto+irc_action") + - wildcard "*" is allowed + - if tag starts with '!', then it is excluded and must NOT be in message + regex: POSIX extended regular expression to search in line + - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|' + - if regex starts with '!', then matching result is reversed (use '\!' to start with '!') + - two regular expressions are created: one for prefix and one for message + - regex are case insensitive, they can start by "(?-i)" to become case sensitive + +The default key alt+'=' toggles filtering on/off. + +Tags most commonly used: + no_filter, no_highlight, no_log, log0..log9 (log level), notify_none, notify_message, notify_private, notify_highlight, - nick_xxx (xxx ist der Nickname), prefix_nick_ccc (ccc ist die Farbe mit der der Nick dargestellt wird), - host_xxx (xxx ist der Username + Host), - irc_xxx (xxx ist durch einen IRC-Befehl/-Nummer zu ersetzen, siehe /server raw oder /debug tags) + self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), + host_xxx (xxx is username + host in message), + irc_xxx (xxx is command name or number, see /server raw or /debug tags), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. -Mittels "/debug tags" kann man sich die Tags jeder einzelnen Zeile darstellen lassen. +To see tags for lines in buffers: /debug tags -Beispiele: - aktiviert den intelligenten IRC Filter für alle Buffer: +Examples: + use IRC smart filter on all buffers: /filter add irc_smart * irc_smart_filter * - aktiviert den intelligenten IRC Filter für alle Buffer, außer Buffer die "#weechat" im Namen tragen: + use IRC smart filter on all buffers except those with "#weechat" in name: /filter add irc_smart *,!*#weechat* irc_smart_filter * - filtert alle IRC join/part/quit Nachrichten: + filter all IRC join/part/quit messages: /filter add joinquit * irc_join,irc_part,irc_quit * - filtert Nicks wenn diese den Channel betreten oder durch den Befehl "/names" angezeigt werden: + filter nicks displayed when joining channels or with /names: /filter add nicks * irc_366 * - filtert Nick "toto" im IRC Channel #weechat: + filter nick "toto" on IRC channel #weechat: /filter add toto irc.freenode.#weechat nick_toto * - filtert IRC join/action Nachrichten von Nick "toto": + filter IRC join/action messages from nick "toto": /filter add toto * nick_toto+irc_join,nick_toto+irc_action * - filtert Zeilen die "weechat sucks" im IRC Channel #weechat enthalten: + filter lines containing "weechat sucks" on IRC channel #weechat: /filter add sucks irc.freenode.#weechat * weechat sucks - filter Zeilen die exakt "WeeChat sucks" lauten und das in allen Buffern: + filter lines that are strictly equal to "WeeChat sucks" on all buffers: /filter add sucks2 * * (?-i)^WeeChat sucks$ ---- diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc index 0f79d5170..d9371e381 100644 --- a/doc/en/autogen/user/weechat_commands.adoc +++ b/doc/en/autogen/user/weechat_commands.adoc @@ -361,7 +361,7 @@ The default key alt+'=' toggles filtering on/off. Tags most commonly used: no_filter, no_highlight, no_log, log0..log9 (log level), notify_none, notify_message, notify_private, notify_highlight, - nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), + self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), host_xxx (xxx is username + host in message), irc_xxx (xxx is command name or number, see /server raw or /debug tags), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. diff --git a/doc/fr/autogen/user/weechat_commands.adoc b/doc/fr/autogen/user/weechat_commands.adoc index a22bc85d7..56c2426c0 100644 --- a/doc/fr/autogen/user/weechat_commands.adoc +++ b/doc/fr/autogen/user/weechat_commands.adoc @@ -361,7 +361,7 @@ La touche par défaut alt+'=' active/désactive le filtrage. Les étiquettes les plus couramment utilisées : no_filter, no_highlight, no_log, log0..log9 (niveau de log), notify_none, notify_message, notify_private, notify_highlight, - nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc (ccc est la couleur du pseudo), + self_msg, nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc (ccc est la couleur du pseudo), host_xxx (xxx est le nom d'utilisateur + hôte dans le message), irc_xxx (xxx est un nom de commande ou nombre, voir /server raw ou /debug tags), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. diff --git a/doc/it/autogen/user/weechat_commands.adoc b/doc/it/autogen/user/weechat_commands.adoc index 25846be42..f3f2b5b67 100644 --- a/doc/it/autogen/user/weechat_commands.adoc +++ b/doc/it/autogen/user/weechat_commands.adoc @@ -361,7 +361,7 @@ The default key alt+'=' toggles filtering on/off. Tags most commonly used: no_filter, no_highlight, no_log, log0..log9 (log level), notify_none, notify_message, notify_private, notify_highlight, - nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), + self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), host_xxx (xxx is username + host in message), irc_xxx (xxx is command name or number, see /server raw or /debug tags), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. diff --git a/doc/ja/autogen/user/weechat_commands.adoc b/doc/ja/autogen/user/weechat_commands.adoc index 35b8334a1..ed32619ea 100644 --- a/doc/ja/autogen/user/weechat_commands.adoc +++ b/doc/ja/autogen/user/weechat_commands.adoc @@ -332,57 +332,57 @@ hdata と変数の名前については、"プラグイン API リファレン rename <name> <new_name> del <name>|-all - list: 全てのフィルタをリストアップ - enable: フィルタを有効化 (フィルタはデフォルトで有効になっています) -disable: フィルタを無効化 - toggle: フィルタの有効無効を切り替え - name: フィルタの名前 ("@" = 現在のバッファに設定されている全てのフィルタを有効化/無効化) - add: フィルタを追加 - rename: フィルタをリネーム - del: フィルタを削除 - -all: 全てのフィルタを削除 - buffer: フィルタが有効化されているバッファのコンマ区切りリスト: - - これはプラグイン名を含む完全な名前です (例: "irc.freenode.#weechat" または "irc.server.freenode") - - "*" は全てのバッファを意味します - - 名前が '!' から始まるものは除外されます - - ワイルドカード "*" を使うことができます - tags: タグのコンマ区切りリスト、例えば "irc_join,irc_part,irc_quit" - - 論理積 "and": タグ同士を "+" でつなげてください (例: "nick_toto+irc_action") - - ワイルドカード "*" を使うことができます - - タグを '!' で始めると、そのタグが付けられたメッセージとそのタグを含むメッセージはフィルタされません - regex: 行単位検索の正規表現 - - '\t' を使うと、プレフィックスをメッセージから分離できます。'|' 等の特別な文字は '\|' のようにエスケープしなければいけません - - 正規表現の最初に '!' が含まれる場合は、マッチ結果が反転されます (最初の '!' にマッチさせたければ、'\!' を使ってください) - - 2 種類の正規表現があります: 一方はプレフィックス用、他方はメッセージ用 - - 正規表現は大文字小文字を区別しません、"(?-i)" から始まる場合は区別します - -デフォルトではキー alt+'=' でフィルタリングの on/off を切り替えられます。 - -よく使われるタグ: - no_filter、no_highlight、no_log、log0..log9 (ログレベル)、 - notify_none、notify_message、notify_private、notify_highlight、 - nick_xxx (xxx はメッセージのニックネーム部分)、prefix_nick_ccc (ccc はニックネームの色)、 - host_xxx (xxx はメッセージのユーザ名 + ホスト名部分)、 - irc_xxx (xxx はコマンド名または番号、/server raw または /debug tags で確認)、 - irc_numeric、irc_error、irc_action、irc_ctcp、irc_ctcp_reply、irc_smart_filter、away_info。 -バッファ内でタグを見るには: /debug tags - -例: - 全てのバッファで IRC スマートフィルタを使用: + list: list all filters + enable: enable filters (filters are enabled by default) +disable: disable filters + toggle: toggle filters + name: filter name ("@" = enable/disable all filters in current buffer) + add: add a filter + rename: rename a filter + del: delete a filter + -all: delete all filters + buffer: comma separated list of buffers where filter is active: + - this is full name including plugin (example: "irc.freenode.#weechat" or "irc.server.freenode") + - "*" means all buffers + - a name starting with '!' is excluded + - wildcard "*" is allowed + tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit" + - logical "and": use "+" between tags (for example: "nick_toto+irc_action") + - wildcard "*" is allowed + - if tag starts with '!', then it is excluded and must NOT be in message + regex: POSIX extended regular expression to search in line + - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|' + - if regex starts with '!', then matching result is reversed (use '\!' to start with '!') + - two regular expressions are created: one for prefix and one for message + - regex are case insensitive, they can start by "(?-i)" to become case sensitive + +The default key alt+'=' toggles filtering on/off. + +Tags most commonly used: + no_filter, no_highlight, no_log, log0..log9 (log level), + notify_none, notify_message, notify_private, notify_highlight, + self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), + host_xxx (xxx is username + host in message), + irc_xxx (xxx is command name or number, see /server raw or /debug tags), + irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. +To see tags for lines in buffers: /debug tags + +Examples: + use IRC smart filter on all buffers: /filter add irc_smart * irc_smart_filter * - 名前に "#weechat" を含むバッファを除いた全てのバッファで IRC スマートフィルタを使用: + use IRC smart filter on all buffers except those with "#weechat" in name: /filter add irc_smart *,!*#weechat* irc_smart_filter * - 全ての IRC join/part/quit メッセージをフィルタ: + filter all IRC join/part/quit messages: /filter add joinquit * irc_join,irc_part,irc_quit * - チャンネルに入った時や /names で表示されるニックネームをフィルタ: + filter nicks displayed when joining channels or with /names: /filter add nicks * irc_366 * - IRC チャンネル #weechat で "toto" を含むニックネームをフィルタ: + filter nick "toto" on IRC channel #weechat: /filter add toto irc.freenode.#weechat nick_toto * - ニックネーム "toto" からの IRC の参加/アクションメッセージをフィルタ: + filter IRC join/action messages from nick "toto": /filter add toto * nick_toto+irc_join,nick_toto+irc_action * - IRC チャンネル #weechat で "weechat sucks" を含む行をフィルタ: + filter lines containing "weechat sucks" on IRC channel #weechat: /filter add sucks irc.freenode.#weechat * weechat sucks - すべてのバッファで "WeeChat sucks" と完全に一致する行をフィルタ: + filter lines that are strictly equal to "WeeChat sucks" on all buffers: /filter add sucks2 * * (?-i)^WeeChat sucks$ ---- diff --git a/doc/pl/autogen/user/weechat_commands.adoc b/doc/pl/autogen/user/weechat_commands.adoc index 7b6f2aab4..96d85742e 100644 --- a/doc/pl/autogen/user/weechat_commands.adoc +++ b/doc/pl/autogen/user/weechat_commands.adoc @@ -332,57 +332,57 @@ Przykłady (warunki): rename <nazwa> <nowa_nazwa> del <nazwa>|-all - list: wyświetla wszystkie filtry - enable: włącza filtry (filtry są domyślnie włączone) -disable: wyłącza filtry - toggle: przełącza filtry - nazwa: nazwa filtru ("@" = włącza/wyłącza wszystkie filtry w obecnym buforze) - add: dodaje filtr - rename: zmienia nazwę filtru - del: usuwa filtr - -all: usuwa wszystkie filtry - bufor: oddzielona przecinkami lisa buforów, dla których filtr jest aktywny: - - jest to pełna nazwa zawierająca wtyczkę (przykład: "irc.freenode.#weechat" lub "irc.server.freenode") - - "*" oznacza wszystkie bufory - - nazwa zaczynająca się od '!' jest wykluczana - - dozwolony jest znak "*" - tagi: lista tagów oddzielona przecinkiem, np: "irc_join,irc_part,irc_quit" - - logiczne "i": użyj "+" pomiędzy tagami (na przykład: "nick_toto+irc_action") - - dozwolony jest znak "*" - - jeśli tag zaczyna się od '!', wtedy jest on wykluczony i NIE może znajdować się w wiadomości - regex: rozszerzone wyrażenie regularne POSIX do wyszukania w linii - - użyj '\t' do oddzielenia prefiksu od wiadomości, znaki specjalne jak '|' muszą zostać poprzedzone '\' np: '\|' - - jeśli wyrażenie zaczyna się od '!', wtedy pasujący wynik jest odwracany (użyj '\!', aby zacząć od '!') - - dwa wyrażenia są tworzone: jedno dla prefiksu, drugie dla wiadomości - - wielkość znaków nie ma znaczenia dla wyrażeń, jeśli zaczynają się od "(?-i)" wielkość znaków ma znaczenie - -Domyślny skrót klawiszowy alt+'=' włącza/wyłącza filtrowanie. - -Najczęściej używane tagi: + list: list all filters + enable: enable filters (filters are enabled by default) +disable: disable filters + toggle: toggle filters + name: filter name ("@" = enable/disable all filters in current buffer) + add: add a filter + rename: rename a filter + del: delete a filter + -all: delete all filters + buffer: comma separated list of buffers where filter is active: + - this is full name including plugin (example: "irc.freenode.#weechat" or "irc.server.freenode") + - "*" means all buffers + - a name starting with '!' is excluded + - wildcard "*" is allowed + tags: comma separated list of tags, for example "irc_join,irc_part,irc_quit" + - logical "and": use "+" between tags (for example: "nick_toto+irc_action") + - wildcard "*" is allowed + - if tag starts with '!', then it is excluded and must NOT be in message + regex: POSIX extended regular expression to search in line + - use '\t' to separate prefix from message, special chars like '|' must be escaped: '\|' + - if regex starts with '!', then matching result is reversed (use '\!' to start with '!') + - two regular expressions are created: one for prefix and one for message + - regex are case insensitive, they can start by "(?-i)" to become case sensitive + +The default key alt+'=' toggles filtering on/off. + +Tags most commonly used: no_filter, no_highlight, no_log, log0..log9 (log level), notify_none, notify_message, notify_private, notify_highlight, - nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), + self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of nick), host_xxx (xxx is username + host in message), irc_xxx (xxx is command name or number, see /server raw or /debug tags), irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, irc_smart_filter, away_info. -Aby zobaczyć listę tagów w liniach buforów wykonaj: /debug tags +To see tags for lines in buffers: /debug tags -Przykłady: - użyj inteligentnego filtru we wszystkich buforach IRC: +Examples: + use IRC smart filter on all buffers: /filter add irc_smart * irc_smart_filter * - użyj inteligentnego filtru we wszystkich buforach IRC poza tymi zawierającymi "#weechat" w nazwie: + use IRC smart filter on all buffers except those with "#weechat" in name: /filter add irc_smart *,!*#weechat* irc_smart_filter * - filtruj wszystkie wiadomości IRC o join/part/quit: + filter all IRC join/part/quit messages: /filter add joinquit * irc_join,irc_part,irc_quit * - filtruj nicki wyświetlane przy wejściu na kanał albo za pomocą /names: + filter nicks displayed when joining channels or with /names: /filter add nicks * irc_366 * - filtruj nick "toto" na kanale IRC #weechat: + filter nick "toto" on IRC channel #weechat: /filter add toto irc.freenode.#weechat nick_toto * - filtruj wejścia/akcje IRC od użytkownika "toto": + filter IRC join/action messages from nick "toto": /filter add toto * nick_toto+irc_join,nick_toto+irc_action * - filtruj linie zawierające fraze "weechat sucks" na kanale IRC #weechat: + filter lines containing "weechat sucks" on IRC channel #weechat: /filter add sucks irc.freenode.#weechat * weechat sucks - filtruj linie "WeeChat sucks" we wszystkich buforach: + filter lines that are strictly equal to "WeeChat sucks" on all buffers: /filter add sucks2 * * (?-i)^WeeChat sucks$ ---- @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1568,8 +1568,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-11-22 21:27+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -1713,6 +1713,7 @@ msgstr "" "list || enable|disable|toggle [<name>|@] || add <name> <buffer>[," "<buffer>...] <tags> <regex> || rename <name> <new_name> || del <name>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1751,8 +1752,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1599,8 +1599,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" -"PO-Revision-Date: 2016-11-25 20:06+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" +"PO-Revision-Date: 2016-11-26 13:55+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -1729,8 +1729,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -1795,8 +1795,8 @@ msgstr "" "Les étiquettes les plus couramment utilisées :\n" " no_filter, no_highlight, no_log, log0..log9 (niveau de log),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc (ccc est la " -"couleur du pseudo),\n" +" self_msg, nick_xxx (xxx est le pseudo dans le message), prefix_nick_ccc " +"(ccc est la couleur du pseudo),\n" " host_xxx (xxx est le nom d'utilisateur + hôte dans le message),\n" " irc_xxx (xxx est un nom de commande ou nombre, voir /server raw ou /debug " "tags),\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:23+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1484,8 +1484,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1640,8 +1640,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-11-23 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/master/" @@ -1643,6 +1643,7 @@ msgstr "" "list || enable|disable|toggle [<name>|@] || add <name> <buffer>[," "<buffer>...] <tags> <regex> || rename <name> <new_name> || del <name>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1681,8 +1682,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Krzysztof Korościk <soltys1@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1683,6 +1683,7 @@ msgstr "" "list || enable|disable|toggle [<nazwa>|@] || add <nazwa> <bufor>[," "<bufor>...] <tagi> <regex> || rename <nazwa> <nowa_nazwa> || del <nazwa>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1721,8 +1722,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-27 12:29+0000\n" "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" "Language-Team: Portuguese <>\n" @@ -1676,6 +1676,7 @@ msgstr "" "list || enable|disable|toggle [<nome>|@] || add <nome> <buffer>[," "<buffer>...] <tags> <regex> || rename <nome> <novo_nome> || del <nome>|-all" +#, fuzzy msgid "" " list: list all filters\n" " enable: enable filters (filters are enabled by default)\n" @@ -1714,8 +1715,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " diff --git a/po/pt_BR.po b/po/pt_BR.po index 62e14f3c9..43b27a28d 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: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1644,8 +1644,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-09-03 08:24+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1506,8 +1506,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\n" "PO-Revision-Date: 2016-05-18 07:43+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1340,8 +1340,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " diff --git a/po/weechat.pot b/po/weechat.pot index 9405e5591..5d1e84c5a 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: 2016-11-25 20:05+0100\n" +"POT-Creation-Date: 2016-11-26 13:55+0100\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" @@ -1343,8 +1343,8 @@ msgid "" "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" -" nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color of " -"nick),\n" +" self_msg, nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " +"of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug tags),\n" " irc_numeric, irc_error, irc_action, irc_ctcp, irc_ctcp_reply, " diff --git a/src/core/wee-command.c b/src/core/wee-command.c index ce20376e3..aa0afc9e7 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -7309,8 +7309,8 @@ command_init () "Tags most commonly used:\n" " no_filter, no_highlight, no_log, log0..log9 (log level),\n" " notify_none, notify_message, notify_private, notify_highlight,\n" - " nick_xxx (xxx is nick in message), prefix_nick_ccc (ccc is color " - "of nick),\n" + " self_msg, nick_xxx (xxx is nick in message), " + "prefix_nick_ccc (ccc is color of nick),\n" " host_xxx (xxx is username + host in message),\n" " irc_xxx (xxx is command name or number, see /server raw or /debug " "tags),\n" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 82e44f433..676bfe9a3 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -643,7 +643,8 @@ irc_command_me_channel_display (struct t_irc_server *server, weechat_printf_date_tags ( channel->buffer, 0, - irc_protocol_tags ("privmsg", "irc_action,notify_none,no_highlight", + irc_protocol_tags ("privmsg", + "irc_action,self_msg,notify_none,no_highlight", server->nick, NULL), "%s%s%s%s%s%s%s", weechat_prefix ("action"), @@ -1446,7 +1447,7 @@ IRC_COMMAND_CALLBACK(ctcp) ptr_server, ctcp_target, NULL, "ctcp", NULL), 0, irc_protocol_tags ("privmsg", - "irc_ctcp,notify_none,no_highlight", + "irc_ctcp,self_msg,notify_none,no_highlight", NULL, NULL), _("%sCTCP query to %s%s%s: %s%s%s%s%s"), weechat_prefix ("network"), @@ -3170,7 +3171,7 @@ IRC_COMMAND_CALLBACK(msg) weechat_printf_date_tags ( ptr_channel2->buffer, 0, - "notify_none,no_highlight", + "self_msg,notify_none,no_highlight", "%s%s%s -> %s%s%s: %s", weechat_prefix ("network"), "Msg", @@ -3260,7 +3261,8 @@ IRC_COMMAND_CALLBACK(msg) ptr_server->buffer, 0, irc_protocol_tags ( - "privmsg", "notify_none,no_highlight", + "privmsg", + "self_msg,notify_none,no_highlight", ptr_server->nick, NULL), "%sMSG%s(%s%s%s)%s: %s", weechat_prefix ("network"), @@ -3441,7 +3443,7 @@ IRC_COMMAND_CALLBACK(notice) ptr_server, argv[arg_target], "notice", NULL, (ptr_channel) ? ptr_channel->buffer : NULL), 0, - "notify_none,no_highlight", + "self_msg,notify_none,no_highlight", "%s%s%s%s -> %s%s%s: %s", weechat_prefix ("network"), IRC_COLOR_NOTICE, diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index 5f2aeec95..c477a72bc 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -298,7 +298,8 @@ irc_ctcp_reply_to_nick (struct t_irc_server *server, 0, irc_protocol_tags ( command, - "irc_ctcp,irc_ctcp_reply,notify_none,no_highlight", + "irc_ctcp,irc_ctcp_reply,self_msg,notify_none," + "no_highlight", NULL, NULL), _("%sCTCP reply to %s%s%s: %s%s%s%s%s"), weechat_prefix ("network"), @@ -1015,11 +1016,12 @@ irc_ctcp_recv (struct t_irc_server *server, time_t date, const char *command, weechat_printf_date_tags ( channel->buffer, date, - irc_protocol_tags (command, - (nick_is_me) ? - "irc_action,notify_none,no_highlight" : - "irc_action,notify_message", - nick, address), + irc_protocol_tags ( + command, + (nick_is_me) ? + "irc_action,self_msg,notify_none,no_highlight" : + "irc_action,notify_message", + nick, address), "%s%s%s%s%s%s%s", weechat_prefix ("action"), irc_nick_mode_for_display (server, ptr_nick, 0), @@ -1054,11 +1056,12 @@ irc_ctcp_recv (struct t_irc_server *server, time_t date, const char *command, weechat_printf_date_tags ( ptr_channel->buffer, date, - irc_protocol_tags (command, - (nick_is_me) ? - "irc_action,notify_none,no_highlight" : - "irc_action,notify_private", - nick, address), + irc_protocol_tags ( + command, + (nick_is_me) ? + "irc_action,self_msg,notify_none,no_highlight" : + "irc_action,notify_private", + nick, address), "%s%s%s%s%s%s", weechat_prefix ("action"), (nick_is_me) ? diff --git a/src/plugins/irc/irc-input.c b/src/plugins/irc/irc-input.c index bad329b77..0bfc564f4 100644 --- a/src/plugins/irc/irc-input.c +++ b/src/plugins/irc/irc-input.c @@ -82,7 +82,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, int action, if (action) { snprintf (str_tags, sizeof (str_tags), - "irc_action,notify_none,no_highlight"); + "irc_action,self_msg,notify_none,no_highlight"); } else { @@ -90,7 +90,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, int action, weechat_config_color ( weechat_config_get ("weechat.color.chat_nick_self"))); snprintf (str_tags, sizeof (str_tags), - "notify_none,no_highlight,prefix_nick_%s", + "notify_none,self_msg,no_highlight,prefix_nick_%s", (str_color) ? str_color : "default"); if (str_color) free (str_color); diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index b85093758..4a1861bbc 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -2043,7 +2043,7 @@ IRC_PROTOCOL_CALLBACK(privmsg) if (nick_is_me) { snprintf (str_tags, sizeof (str_tags), - "notify_none,no_highlight,prefix_nick_%s", + "self_msg,notify_none,no_highlight,prefix_nick_%s", (str_color) ? str_color : "default"); } else |