diff --git a/ChangeLog b/ChangeLog index 8bc3d12f4..bfe3a6c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.4.2-dev, 2013-07-10 +v0.4.2-dev, 2013-07-11 This document lists all changes for each version. @@ -33,6 +33,7 @@ Version 0.4.2 (under dev!) * core: fix line alignment when option weechat.look.buffer_time_format is set to empty string * aspell: add support of enchant library (patch #6858) +* irc: add option irc.look.pv_tags * irc: fix error message on /invite without arguments (bug #39272) * irc: add support of special variables $nick/$channel/$server in commands /allchan and /allserv diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index c6794c902..2a53bf5b7 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -254,12 +254,12 @@ ** Werte: auto, never, always (Standardwert: `auto`) * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* -** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen, falls sich ein Nick beim Server an- oder abmeldet (Rückgabe durch Befehl ison), zum Beispiel: "notify_highlight","notify_message" oder "notify_private"` +** Beschreibung: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`) * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* -** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von notify ausgegeben werden sollen, falls ein Nick den Befehl away nutzt (Rückgabe durch Befehl whois), zum Beispiel: "notify_highlight", "notify_message" oder "notify_private"` +** Beschreibung: `comma separated list of tags used in messages displayed by notify when a nick away status changes (result of command whois), for example: "notify_message", "notify_private" or "notify_highlight"` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"notify_message"`) @@ -273,6 +273,11 @@ ** Typ: integer ** Werte: independent, merge_by_server, merge_all (Standardwert: `independent`) +* [[option_irc.look.pv_tags]] *irc.look.pv_tags* +** Beschreibung: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `"notify_private"`) + * [[option_irc.look.raw_messages]] *irc.look.raw_messages* ** Beschreibung: `Anzahl der IRC-RAW-Nachrichten die im Speicher gehalten werden sollen falls der RAW-Daten-Buffer geschlossen ist (die Nachrichten werden umgehend angezeigt sobald der RAW-Daten-Buffer geöffnet wird)` ** Typ: integer diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index dd0d719cd..08f645290 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -254,12 +254,12 @@ ** values: auto, never, always (default value: `auto`) * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* -** description: `comma separated list of tags used in messages printed by notify when a nick joins or quits server (result of command ison), for example: "notify_highlight", "notify_message" or "notify_private"` +** description: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"` ** type: string ** values: any string (default value: `"notify_message"`) * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* -** description: `comma separated list of tags used in messages printed by notify when a nick away status changes (result of command whois), for example: "notify_highlight", "notify_message" or "notify_private"` +** description: `comma separated list of tags used in messages displayed by notify when a nick away status changes (result of command whois), for example: "notify_message", "notify_private" or "notify_highlight"` ** type: string ** values: any string (default value: `"notify_message"`) @@ -273,6 +273,11 @@ ** type: integer ** values: independent, merge_by_server, merge_all (default value: `independent`) +* [[option_irc.look.pv_tags]] *irc.look.pv_tags* +** description: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"` +** type: string +** values: any string (default value: `"notify_private"`) + * [[option_irc.look.raw_messages]] *irc.look.raw_messages* ** description: `number of raw messages to save in memory when raw data buffer is closed (messages will be displayed when opening raw data buffer)` ** type: integer diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index ec3a9a8e8..54167ccc4 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -254,12 +254,12 @@ ** valeurs: auto, never, always (valeur par défaut: `auto`) * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* -** description: `liste des tags (séparés par des virgules) utilisés dans les messages affichés par notify lorsqu'un pseudo a rejoint ou quitté le serveur (résultat de la commande ison), par exemple: "notify_highlight", "notify_message" ou "notify_private"` +** description: `liste des tags (séparés par des virgules) utilisés dans les messages affichés par notify lorsqu'un pseudo a rejoint ou quitté le serveur (résultat de la commande ison), par exemple: "notify_message", "notify_private" ou "notify_highlight"` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"notify_message"`) * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* -** description: `liste des tags (séparés par des virgules) utilisés dans les messages affichés par notify lorsque le statut d'absence d'un pseudo change (résultat de la commande whois), par exemple: "notify_highlight", "notify_message" ou "notify_private"` +** description: `liste des tags (séparés par des virgules) utilisés dans les messages affichés par notify lorsque le statut d'absence d'un pseudo change (résultat de la commande whois), par exemple: "notify_message", "notify_private" ou "notify_highlight"` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"notify_message"`) @@ -273,6 +273,11 @@ ** type: entier ** valeurs: independent, merge_by_server, merge_all (valeur par défaut: `independent`) +* [[option_irc.look.pv_tags]] *irc.look.pv_tags* +** description: `liste des tags (séparés par des virgules) utilisés dans les messages privés, par exemple: "notify_message", "notify_private" ou "notify_highlight"` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `"notify_private"`) + * [[option_irc.look.raw_messages]] *irc.look.raw_messages* ** description: `nombre de messages bruts à sauvegarder en mémoire lorsque le tampon des données brutes est fermé (ces messages seront affichés lors de l'ouverture du tampon des données brutes)` ** type: entier diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 0846818d8..fa3abc7fc 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -254,12 +254,12 @@ ** valori: auto, never, always (valore predefinito: `auto`) * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* -** descrizione: `elenco separato da virgole di tag usati nei messaggi stampati dalle notifiche quando un nick entra o esce da un server (risultato del comando ison), ad esempio: "notify_highlight", "notify_message" o "notify_private"` +** descrizione: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"notify_message"`) * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* -** descrizione: `elenco separato da virgole di tag usati nei messaggi stampati dalle notifiche quando un nick cambia lo stato di assenza (risultato del comando whois), ad esempio: "notify_highligh", "notify_message" o "notify_private"` +** descrizione: `comma separated list of tags used in messages displayed by notify when a nick away status changes (result of command whois), for example: "notify_message", "notify_private" or "notify_highlight"` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"notify_message"`) @@ -273,6 +273,11 @@ ** tipo: intero ** valori: independent, merge_by_server, merge_all (valore predefinito: `independent`) +* [[option_irc.look.pv_tags]] *irc.look.pv_tags* +** descrizione: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `"notify_private"`) + * [[option_irc.look.raw_messages]] *irc.look.raw_messages* ** descrizione: `numero di messaggi raw da salvare in memoria quando il buffer dei dati raw viene chiuso (i messaggi verranno visualizzati all'apertura del buffer dei dati raw)` ** tipo: intero diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index c7f58ab18..8d9c1c68d 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -254,12 +254,12 @@ ** 値: auto, never, always (デフォルト値: `auto`) * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* -** 説明: `ニックネームが参加またはサーバから切断したときの (ison コマンドの結果)、notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_highlight"、"notify_message"、"notify_private"` +** 説明: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `"notify_message"`) * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* -** 説明: `ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_highlight"、"notify_message"、"notify_private"` +** 説明: `comma separated list of tags used in messages displayed by notify when a nick away status changes (result of command whois), for example: "notify_message", "notify_private" or "notify_highlight"` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `"notify_message"`) @@ -273,6 +273,11 @@ ** タイプ: 整数 ** 値: independent, merge_by_server, merge_all (デフォルト値: `independent`) +* [[option_irc.look.pv_tags]] *irc.look.pv_tags* +** 説明: `comma separated list of tags used in private messages, for example: "notify_message", "notify_private" or "notify_highlight"` +** タイプ: 文字列 +** 値: 未制約文字列 (デフォルト値: `"notify_private"`) + * [[option_irc.look.raw_messages]] *irc.look.raw_messages* ** 説明: `生データバッファが閉じられた時にメモリに保存する生メッセージの数 (生データバッファを開いたときに表示されるメッセージ)` ** タイプ: 整数 diff --git a/po/cs.po b/po/cs.po index 50941a4e3..8c3dfe0f9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-06-10 09:13+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -6138,19 +6138,21 @@ msgstr "" "zobrazovat upozornění jako soukromé zprávy (pokud je automaticky, použije se " "soukromý buffer, kdy existuje)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "čárkou oddělený seznam značek použitých ve zprávách vypsaných notifikacemi, " "když se přezdívka připojí/odpojí k/ze serveru (výsledek příkazu ison), " "například: \"notify_highlight\", \"notify_message\" or \"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "čárkou oddělený seznam značek použitých ve zprávách vypsaných notifikacemi, " "když se změní status nepřítomnosti přezdívky (výsledek příkazu whois), " @@ -6163,6 +6165,15 @@ msgstr "zavřít buffer, když je na kanálu spuštěn /part" msgid "merge private buffers" msgstr "spojit buffery serverů" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"čárkou oddělený seznam značek použitých ve zprávách vypsaných notifikacemi, " +"když se přezdívka připojí/odpojí k/ze serveru (výsledek příkazu ison), " +"například: \"notify_highlight\", \"notify_message\" or \"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/de.po b/po/de.po index 7c51a88d9..37d9ba2f3 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 22:20+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -6776,20 +6776,22 @@ msgstr "" "zeigt Notizen als private Nachricht an (wird die \"auto\" Option verwendet " "dann wird ein privater Buffer genutzt, falls vorhanden)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von " "notify ausgegeben werden sollen, falls sich ein Nick beim Server an- oder " "abmeldet (Rückgabe durch Befehl ison), zum Beispiel: \"notify_highlight\"," "\"notify_message\" oder \"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von " "notify ausgegeben werden sollen, falls ein Nick den Befehl away nutzt " @@ -6802,6 +6804,16 @@ msgstr "schließt den Buffer wenn \"/part\" im Channel ausgeführt wird" msgid "merge private buffers" msgstr "private Buffer zusammenfügen" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"durch Kommata getrennte Liste von Schlagwörtern die in der Nachricht von " +"notify ausgegeben werden sollen, falls sich ein Nick beim Server an- oder " +"abmeldet (Rückgabe durch Befehl ison), zum Beispiel: \"notify_highlight\"," +"\"notify_message\" oder \"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/es.po b/po/es.po index 64bd01406..8fa3ff09e 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 15:57+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -6387,19 +6387,21 @@ msgstr "" "mostrar avisos como mensajes privados (si es auto, usa un buffer privado si " "lo encuentra)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "lista separada por comas de etiquetas usadas en los mensajes de notificación " "cuando un apodo se une o abandona el servidor (resultado del comando ison), " "por ejemplo: \"notify_highlight\", \"notify_message\" o \"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "lista separada por comas de etiquetas usadas en los mensajes de notificación " "cuando un apodo cambia su estado de ausencia (resultado del comando whois), " @@ -6412,6 +6414,15 @@ msgstr "cerrar el buffer cuando /part es usado en un canal" msgid "merge private buffers" msgstr "unir buffers de los servidores" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"lista separada por comas de etiquetas usadas en los mensajes de notificación " +"cuando un apodo se une o abandona el servidor (resultado del comando ison), " +"por ejemplo: \"notify_highlight\", \"notify_message\" o \"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/fr.po b/po/fr.po index fce9b7d37..e0077ac28 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" -"PO-Revision-Date: 2013-07-05 18:10+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" +"PO-Revision-Date: 2013-07-11 20:02+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -6595,24 +6595,24 @@ msgstr "" "privé s'il est trouvé)" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "liste des tags (séparés par des virgules) utilisés dans les messages " "affichés par notify lorsqu'un pseudo a rejoint ou quitté le serveur " -"(résultat de la commande ison), par exemple: \"notify_highlight\", " -"\"notify_message\" ou \"notify_private\"" +"(résultat de la commande ison), par exemple: \"notify_message\", " +"\"notify_private\" ou \"notify_highlight\"" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "liste des tags (séparés par des virgules) utilisés dans les messages " "affichés par notify lorsque le statut d'absence d'un pseudo change (résultat " -"de la commande whois), par exemple: \"notify_highlight\", \"notify_message\" " -"ou \"notify_private\"" +"de la commande whois), par exemple: \"notify_message\", \"notify_private\" " +"ou \"notify_highlight\"" msgid "close buffer when /part is issued on a channel" msgstr "fermer le tampon lorsque /part est exécuté sur un canal" @@ -6620,6 +6620,13 @@ msgstr "fermer le tampon lorsque /part est exécuté sur un canal" msgid "merge private buffers" msgstr "mélanger les tampons privés" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"liste des tags (séparés par des virgules) utilisés dans les messages privés, " +"par exemple: \"notify_message\", \"notify_private\" ou \"notify_highlight\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/hu.po b/po/hu.po index 3b52e38d1..76bce5eac 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 15:57+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5675,15 +5675,15 @@ msgid "" msgstr "figyelmeztetések privát üzenetként való mutatása" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "close buffer when /part is issued on a channel" @@ -5693,6 +5693,11 @@ msgstr "" msgid "merge private buffers" msgstr "pufferek kezelése" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/it.po b/po/it.po index 43ebf7a94..0cf49ee77 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-06-14 19:39-0300\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -6452,20 +6452,22 @@ msgstr "" "visualizza notifiche come messaggi privati (se automatico, usa il buffer " "privato se viene trovato)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "elenco separato da virgole di tag usati nei messaggi stampati dalle " "notifiche quando un nick entra o esce da un server (risultato del comando " "ison), ad esempio: \"notify_highlight\", \"notify_message\" o " "\"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "elenco separato da virgole di tag usati nei messaggi stampati dalle " "notifiche quando un nick cambia lo stato di assenza (risultato del comando " @@ -6478,6 +6480,16 @@ msgstr "chiude buffer quando viene digitato /part nel canale" msgid "merge private buffers" msgstr "unisci i buffer privati" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"elenco separato da virgole di tag usati nei messaggi stampati dalle " +"notifiche quando un nick entra o esce da un server (risultato del comando " +"ison), ad esempio: \"notify_highlight\", \"notify_message\" o " +"\"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/ja.po b/po/ja.po index 79ff52b36..c43aa6afe 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 16:02+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6355,19 +6355,21 @@ msgstr "" "notice をプライベートメッセージとして表示 (auto の場合、プライベートバッファ" "が見つかればそれを使用する)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "ニックネームが参加またはサーバから切断したときの (ison コマンドの結果)、" "notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例え" "ば: \"notify_highlight\"、\"notify_message\"、\"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify に" "よって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: " @@ -6379,6 +6381,15 @@ msgstr "/part を実行した場合にバッファを閉じる" msgid "merge private buffers" msgstr "プライベートバッファをマージ" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"ニックネームが参加またはサーバから切断したときの (ison コマンドの結果)、" +"notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例え" +"ば: \"notify_highlight\"、\"notify_message\"、\"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/pl.po b/po/pl.po index 0b057c55e..8cd6c7b46 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 15:37+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6484,20 +6484,22 @@ msgstr "" "wyświetlaj powiadomienia jako prywatne wiadomości (jeśli auto, używa " "prywatnego bufora jeśli taki istnieje)" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "oddzielona przecinkami lista tagów użytych w wiadomościach wyświetlanych " "przez powiadomienie, kiedy nick wejdzie lub wyjdzie z serwera (rezultat " "komendy ison), na przykład: \"notify_highlight\", \"notify_message\" lub " "\"notify_private\"" +#, fuzzy msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" "oddzielona przecinkami lista tagów użytych w wiadomościach wyświetlanych " "przez powiadomienie, kiedy zmienia się status nieobecności nicka (wynik " @@ -6510,6 +6512,16 @@ msgstr "zamyka bufor, kiedy na kanale wykonamy /part" msgid "merge private buffers" msgstr "połącz bufory prywatne" +#, fuzzy +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" +"oddzielona przecinkami lista tagów użytych w wiadomościach wyświetlanych " +"przez powiadomienie, kiedy nick wejdzie lub wyjdzie z serwera (rezultat " +"komendy ison), na przykład: \"notify_highlight\", \"notify_message\" lub " +"\"notify_private\"" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 80362ec12..2e60c5ffe 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-06-10 09:19+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -5864,15 +5864,15 @@ msgid "" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "close buffer when /part is issued on a channel" @@ -5882,6 +5882,11 @@ msgstr "fechar buffer quando o comando /part é executado em um canal" msgid "merge private buffers" msgstr "mesclar buffers de servidores" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/ru.po b/po/ru.po index d04fa9409..b3f8063af 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-07-02 16:02+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5699,15 +5699,15 @@ msgid "" msgstr "отображать notice'ы в виде личных сообщений" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "close buffer when /part is issued on a channel" @@ -5717,6 +5717,11 @@ msgstr "" msgid "merge private buffers" msgstr "управление буферами" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/tr.po b/po/tr.po index b0f57a7a4..1688d85b0 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-06-28 13:51+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -4984,15 +4984,15 @@ msgid "" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "close buffer when /part is issued on a channel" @@ -5001,6 +5001,11 @@ msgstr "" msgid "merge private buffers" msgstr "" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/po/weechat.pot b/po/weechat.pot index 767e1a0ef..efa160fc3 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-07-11 19:51+0200\n" +"POT-Creation-Date: 2013-07-11 21:45+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -4949,15 +4949,15 @@ msgid "" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"joins or quits server (result of command ison), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick joins or quits server (result of command ison), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "" -"comma separated list of tags used in messages printed by notify when a nick " -"away status changes (result of command whois), for example: " -"\"notify_highlight\", \"notify_message\" or \"notify_private\"" +"comma separated list of tags used in messages displayed by notify when a " +"nick away status changes (result of command whois), for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" msgstr "" msgid "close buffer when /part is issued on a channel" @@ -4966,6 +4966,11 @@ msgstr "" msgid "merge private buffers" msgstr "" +msgid "" +"comma separated list of tags used in private messages, for example: " +"\"notify_message\", \"notify_private\" or \"notify_highlight\"" +msgstr "" + msgid "" "number of raw messages to save in memory when raw data buffer is closed " "(messages will be displayed when opening raw data buffer)" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 584e8027e..34f4fd89f 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -90,6 +90,7 @@ struct t_config_option *irc_config_look_notify_tags_ison; struct t_config_option *irc_config_look_notify_tags_whois; struct t_config_option *irc_config_look_part_closes_buffer; struct t_config_option *irc_config_look_pv_buffer; +struct t_config_option *irc_config_look_pv_tags; struct t_config_option *irc_config_look_raw_messages; struct t_config_option *irc_config_look_server_buffer; struct t_config_option *irc_config_look_smart_filter; @@ -2442,19 +2443,19 @@ irc_config_init () irc_config_look_notify_tags_ison = weechat_config_new_option ( irc_config_file, ptr_section, "notify_tags_ison", "string", - N_("comma separated list of tags used in messages printed by notify " + N_("comma separated list of tags used in messages displayed by notify " "when a nick joins or quits server (result of command ison), " - "for example: \"notify_highlight\", \"notify_message\" or " - "\"notify_private\""), + "for example: \"notify_message\", \"notify_private\" or " + "\"notify_highlight\""), NULL, 0, 0, "notify_message", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_notify_tags_whois = weechat_config_new_option ( irc_config_file, ptr_section, "notify_tags_whois", "string", - N_("comma separated list of tags used in messages printed by notify " + N_("comma separated list of tags used in messages displayed by notify " "when a nick away status changes (result of command whois), " - "for example: \"notify_highlight\", \"notify_message\" or " - "\"notify_private\""), + "for example: \"notify_message\", \"notify_private\" or " + "\"notify_highlight\""), NULL, 0, 0, "notify_message", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_look_part_closes_buffer = weechat_config_new_option ( @@ -2469,6 +2470,13 @@ irc_config_init () "independent|merge_by_server|merge_all", 0, 0, "independent", NULL, 0, NULL, NULL, &irc_config_change_look_pv_buffer, NULL, NULL, NULL); + irc_config_look_pv_tags = weechat_config_new_option ( + irc_config_file, ptr_section, + "pv_tags", "string", + N_("comma separated list of tags used in private messages, for example: " + "\"notify_message\", \"notify_private\" or \"notify_highlight\""), + NULL, 0, 0, "notify_private", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_raw_messages = weechat_config_new_option ( irc_config_file, ptr_section, "raw_messages", "integer", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index ddd4a0944..a5762ef91 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -138,6 +138,7 @@ extern struct t_config_option *irc_config_look_notify_tags_ison; extern struct t_config_option *irc_config_look_notify_tags_whois; extern struct t_config_option *irc_config_look_part_closes_buffer; extern struct t_config_option *irc_config_look_pv_buffer; +extern struct t_config_option *irc_config_look_pv_tags; extern struct t_config_option *irc_config_look_raw_messages; extern struct t_config_option *irc_config_look_server_buffer; extern struct t_config_option *irc_config_look_smart_filter; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index bde83fa0a..59431d722 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1510,8 +1510,8 @@ IRC_PROTOCOL_CALLBACK(pong) IRC_PROTOCOL_CALLBACK(privmsg) { - char *pos_args, *pos_target, str_tags[256], *str_color; - const char *remote_nick; + char *pos_args, *pos_target, str_tags[1024], *str_color; + const char *remote_nick, *pv_tags; int msg_op, msg_voice, is_channel, nick_is_me; struct t_irc_channel *ptr_channel; struct t_irc_nick *ptr_nick; @@ -1665,11 +1665,21 @@ IRC_PROTOCOL_CALLBACK(privmsg) else str_color = irc_color_for_tags (weechat_config_color (weechat_config_get ("weechat.color.chat_nick_other"))); } - snprintf (str_tags, sizeof (str_tags), - (nick_is_me) ? - "notify_none,no_highlight,prefix_nick_%s" : - "notify_private,prefix_nick_%s", - (str_color) ? str_color : "default"); + if (nick_is_me) + { + snprintf (str_tags, sizeof (str_tags), + "notify_none,no_highlight,prefix_nick_%s", + (str_color) ? str_color : "default"); + } + else + { + pv_tags = weechat_config_string (irc_config_look_pv_tags); + snprintf (str_tags, sizeof (str_tags), + "%s%sprefix_nick_%s", + (pv_tags && pv_tags[0]) ? pv_tags : "", + (pv_tags && pv_tags[0]) ? "," : "", + (str_color) ? str_color : "default"); + } if (str_color) free (str_color); weechat_printf_date_tags (ptr_channel->buffer,