diff --git a/ChangeLog b/ChangeLog index a63a83a63..6cac176f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.3-dev, 2010-06-04 +v0.3.3-dev, 2010-06-08 Version 0.3.3 (under dev!) @@ -10,12 +10,15 @@ Version 0.3.3 (under dev!) * core: add keys for undo/redo changes on command line (default: ctrl/alt + underscore) (task #9483) * core: add new option weechat.look.confirm_quit +* core: add new option weechat.color.status_name_ssl (task #10339) * core: fix bug with scroll_unread: do not scroll to a filtered line (bug #29991) * core: fix crash with hook_process (when timer is called on a deleted hook process) * api: add function "string_expand_home", fix bug with replacement of home in paths +* irc: add new options irc.look.display_host_join/join_local/quit and + irc.color.reason_quit * irc: move options weechat.color.nicklist_prefix to irc plugin * irc: fix bug with command-line option "irc://" (bug #29990), new format for port and channels @@ -26,7 +29,6 @@ Version 0.3.3 (under dev!) * irc: add message in private buffer when nick is back on server after a /quit * irc: add new options irc.network.autoreconnect_delay_growing and irc.network.autoreconnect_delay_max (task #10338) -* irc: add new option weechat.color.status_name_ssl (task #10339) * irc: add missing commands 346, 347 (channel invite list) * irc: fix display of message 330 on some servers * irc: fix bug with nick prefix '*' (chan founder) on some IRC servers diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index d5db91e73..1bce57db0 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -48,6 +48,11 @@ ** type: color ** values: a color name (default value: green) +* *irc.color.reason_quit* +** description: color for reason in part/quit messages +** type: color +** values: a color name (default value: default) + * *irc.look.color_nicks_in_server_messages* ** description: use nick color in messages from server ** type: boolean @@ -78,6 +83,21 @@ ** type: boolean ** values: on, off (default value: on) +* *irc.look.display_host_join* +** description: display host in join messages +** type: boolean +** values: on, off (default value: on) + +* *irc.look.display_host_join_local* +** description: display host in join messages from local client +** type: boolean +** values: on, off (default value: on) + +* *irc.look.display_host_quit* +** description: display host in part/quit messages +** type: boolean +** values: on, off (default value: on) + * *irc.look.display_old_topic* ** description: display old topic when channel topic is changed ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 872d8ec32..104cf8c1a 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -48,6 +48,11 @@ ** type: couleur ** valeurs: un nom de couleur (valeur par défaut: green) +* *irc.color.reason_quit* +** description: couleur pour la raison dans les messages part/quit +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: default) + * *irc.look.color_nicks_in_server_messages* ** description: utiliser la couleur du pseudo dans les messages du serveur ** type: booléen @@ -78,6 +83,21 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: on) +* *irc.look.display_host_join* +** description: afficher le nom d'hôte dans les messages join +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.display_host_join_local* +** description: afficher le nom d'hôte dans les messages join du client local +** type: booléen +** valeurs: on, off (valeur par défaut: on) + +* *irc.look.display_host_quit* +** description: afficher le nom d'hôte dans les messages part/quit +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *irc.look.display_old_topic* ** description: afficher l'ancien titre lorsque le titre du canal est changé ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 3d0fec157..c9b5c1014 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -48,6 +48,11 @@ ** tipo: colore ** valori: un nome colore (valore predefinito: green) +* *irc.color.reason_quit* +** descrizione: color for reason in part/quit messages +** tipo: colore +** valori: un nome colore (valore predefinito: default) + * *irc.look.color_nicks_in_server_messages* ** descrizione: utilizza i colori dei nick nei messaggi dal server ** tipo: bool @@ -78,6 +83,21 @@ ** tipo: bool ** valori: on, off (valore predefinito: on) +* *irc.look.display_host_join* +** descrizione: display host in join messages +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.display_host_join_local* +** descrizione: display host in join messages from local client +** tipo: bool +** valori: on, off (valore predefinito: on) + +* *irc.look.display_host_quit* +** descrizione: display host in part/quit messages +** tipo: bool +** valori: on, off (valore predefinito: on) + * *irc.look.display_old_topic* ** descrizione: visualizza l'argomento del canale precedente quando viene cambiato ** tipo: bool diff --git a/po/cs.po b/po/cs.po index 9df4722f2..40b3f0e39 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-05-20 12:20+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:17+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "Language: Czech\n" @@ -4428,6 +4428,18 @@ msgstr "zobrazit CTCP odpověď poslanou WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "zobrazit CTCP zprávu i když je to neznámé CTCP" +#, fuzzy +msgid "display host in join messages" +msgstr "barva textu vezprávách připojení" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "barva textu vezprávách připojení" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "barva textu ve zprávách odchodu/ukončení" + msgid "display old topic when channel topic is changed" msgstr "zobrazit staré téma rozhovoru, když se téma změní" @@ -4542,6 +4554,10 @@ msgstr "barva položek, které jsou pryč" msgid "color for channel modes, near channel name" msgstr "barva módů kanálu, blízko jména kanálu" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "barva textu ve zprávách odchodu/ukončení" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4809,8 +4825,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: nemohu vytvořit nový kanál \"%s\"" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s se připojil %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s se připojil %s%s%s" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -4849,20 +4865,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s je nyní známý jako %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s opustil %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s opustil %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s opustil %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s opustil %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s skončil %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s skončil %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s skončil" +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" #, c-format msgid "%s%s: \"%s\" command received without channel" diff --git a/po/de.po b/po/de.po index 01ea90f89..d186c5e84 100644 --- a/po/de.po +++ b/po/de.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-05-24 10:01+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:16+0200\n" "Last-Translator: Nils G \n" "Language-Team: weechat-dev \n" "Language: German\n" @@ -4602,6 +4602,24 @@ msgstr "CTCP Antworten, die durch WeeChat versendet wurden, werden angezeigt" msgid "display CTCP message even if it is unknown CTCP" msgstr "unbekannte CTCP Nachrichten werden angezeigt." +#, fuzzy +msgid "display host in join messages" +msgstr "" +"Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt " +"werden soll" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "" +"Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt " +"werden soll" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "" +"Textfarbe in der die Meldungen für das Verlassen/Beenden eines Channels " +"angezeigt werden soll" + msgid "display old topic when channel topic is changed" msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde" @@ -4727,6 +4745,12 @@ msgstr "Farbe des Abwesenheit-Textes in der Eingabezeile" msgid "color for channel modes, near channel name" msgstr "Farbe der Channel-Modes (neben dem Channelnamen)" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "" +"Textfarbe in der die Meldungen für das Verlassen/Beenden eines Channels " +"angezeigt werden soll" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5007,8 +5031,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: Konnte den neuen Channel \"%s\" nicht erzeugen" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s ist in den Channel %s%s%s gekommen" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s ist in den Channel %s%s%s gekommen" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -5047,20 +5071,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s ist nun als %s%s%s bekannt" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s verlässt %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s verlässt %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s verlässt %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s verlässt %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%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 %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s hat den IRC verlassen %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s hat den IRC verlassen" +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 "%s%s: \"%s\" command received without channel" diff --git a/po/es.po b/po/es.po index c2e034682..39c77ef98 100644 --- a/po/es.po +++ b/po/es.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-05-20 12:31+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:19+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: Spanish\n" @@ -4490,6 +4490,18 @@ msgstr "mostrar respuesta CTCP enviada por WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "mostrar mensaje CTCP incluso si es un CTCP desconocido" +#, fuzzy +msgid "display host in join messages" +msgstr "color para el texto en mensajes de unión" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "color para el texto en mensajes de unión" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "color para el texto en mensajes de salida/abandono" + msgid "display old topic when channel topic is changed" msgstr "mostrar el tema anterior cuando se cambia el tema del canal" @@ -4609,6 +4621,10 @@ msgstr "color para el texto \"ausente\" en al barra de entrada" msgid "color for channel modes, near channel name" msgstr "color para los modos del canal, junto al nombre del canal" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "color para el texto en mensajes de salida/abandono" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4880,8 +4896,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: no es posible crear el nuevo canal \"%s\"" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s se ha unido a %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s se ha unido a %s%s%s" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -4920,20 +4936,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s es conocido ahora como %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s ha abandonado %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s ha abandonado %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s ha abandonado %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s ha abandonado %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s ha salido %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s ha salido %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s ha salido" +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" #, c-format msgid "%s%s: \"%s\" command received without channel" diff --git a/po/fr.po b/po/fr.po index 293d77301..5ae8a4bc4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-06-04 11:47+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:51+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -4532,6 +4532,15 @@ msgstr "afficher la réponse CTCP envoyée par WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "afficher le message CTCP même si le CTCP est inconnu" +msgid "display host in join messages" +msgstr "afficher le nom d'hôte dans les messages join" + +msgid "display host in join messages from local client" +msgstr "afficher le nom d'hôte dans les messages join du client local" + +msgid "display host in part/quit messages" +msgstr "afficher le nom d'hôte dans les messages part/quit" + msgid "display old topic when channel topic is changed" msgstr "afficher l'ancien titre lorsque le titre du canal est changé" @@ -4653,6 +4662,9 @@ msgstr "couleur pour l'objet away" msgid "color for channel modes, near channel name" msgstr "couleur pour les modes du canal, à côté du nom du canal" +msgid "color for reason in part/quit messages" +msgstr "couleur pour la raison dans les messages part/quit" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4926,8 +4938,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: impossible de créer le nouveau canal \"%s\"" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s a rejoint %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s a rejoint %s%s%s" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -4966,20 +4978,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s est maintenant connu sous le nom %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s a quitté %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s a quitté %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s a quitté %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s a quitté %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s a quitté %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s a quitté %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s a quitté" +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 "%s%s: \"%s\" command received without channel" diff --git a/po/hu.po b/po/hu.po index 9be35a31e..f8a5a4958 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4246,6 +4246,18 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +#, fuzzy +msgid "display host in join messages" +msgstr "új üzenetet tartalmazó ablak színe" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "új üzenetet tartalmazó ablak színe" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "alapértelmezett kilépő üzenet" + msgid "display old topic when channel topic is changed" msgstr "" @@ -4353,6 +4365,10 @@ msgstr "távollevő felhasználók nevének színe" msgid "color for channel modes, near channel name" msgstr "szobanevek színe az eseményekben" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "alapértelmezett kilépő üzenet" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4625,7 +4641,7 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s nem sikerült új szobát nyitni \"%s\"\n" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s %s(%s%s%s)%s belépett a(z) %s%s szobába\n" #, fuzzy, c-format @@ -4665,19 +4681,19 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s mostantól: %s%s\n" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" msgstr "%s%s %s(%s%s%s)%s elhagyta a(z) %s%s szobát" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" msgstr "%s%s %s(%s%s%s)%s elhagyta a(z) %s%s szobát" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" msgstr "%s%s %s(%s%s%s)%s kilépett" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" +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 diff --git a/po/it.po b/po/it.po index 722cc1bd2..e5533c71b 100644 --- a/po/it.po +++ b/po/it.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-05-24 10:01+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:15+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" "Language: Italian\n" @@ -4496,6 +4496,18 @@ msgstr "visualizza risposta CTCP inviata da WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "visualizza messaggio CTCP anche se è CTCP sconosciuto" +#, fuzzy +msgid "display host in join messages" +msgstr "colore per il testo nei messaggi di entrata" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "colore per il testo nei messaggi di entrata" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "colore per il testo nei messaggi di uscita/abbandono" + msgid "display old topic when channel topic is changed" msgstr "visualizza l'argomento del canale precedente quando viene cambiato" @@ -4620,6 +4632,10 @@ msgstr "colore per l'elemento assenza" msgid "color for channel modes, near channel name" msgstr "colore per le modalità dei canali, vicino ai nomi dei canali" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "colore per il testo nei messaggi di uscita/abbandono" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4893,8 +4909,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: impossibile creare il nuovo canale \"%s\"" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s è entrato in %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s è entrato in %s%s%s" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -4933,20 +4949,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s ora è conosciuto come %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s è uscito da %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s è uscito da %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s è uscito da %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s è uscito da %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s si è disconnesso %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s si è disconnesso %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s si è disconnesso" +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" #, c-format msgid "%s%s: \"%s\" command received without channel" diff --git a/po/pl.po b/po/pl.po index c3e13aee9..b2a53ac6c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" -"PO-Revision-Date: 2010-05-20 12:22+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" +"PO-Revision-Date: 2010-06-08 14:20+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" "Language: Polish\n" @@ -4471,6 +4471,18 @@ msgstr "wyświetlaj odpowiedź CTCP wysłaną przez WeeChat" msgid "display CTCP message even if it is unknown CTCP" msgstr "wyświetl wiadomość CTCP nawet jeśli jest to nieznana CTCP" +#, fuzzy +msgid "display host in join messages" +msgstr "kolor tekstu w wiadomościach o wejsciu na kanał" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "kolor tekstu w wiadomościach o wejsciu na kanał" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC" + msgid "display old topic when channel topic is changed" msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału" @@ -4587,6 +4599,10 @@ msgstr "kolor elementu nieobecności" msgid "color for channel modes, near channel name" msgstr "kolor trybów kanału, przy nazwie kanału" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4858,8 +4874,8 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s%s: nie można utworzyć nowego kanału \"%s\"" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s wszedł na %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s wszedł na %s%s%s" #, c-format msgid "%s%s: channel \"%s\" not found for \"%s\" command" @@ -4898,20 +4914,20 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s%s zmienił nick na %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" -msgstr "%s%s%s %s(%s%s%s)%s opuścił %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s opuścił %s%s%s %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" -msgstr "%s%s%s %s(%s%s%s)%s opuścił %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" +msgstr "%s%s%s%s%s%s%s%s%s%s opuścił %s%s%s" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" -msgstr "%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 %s(%s%s%s)" +msgstr "%s%s%s%s%s%s%s%s%s%s wyszedł z IRC %s(%s%s%s)" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" -msgstr "%s%s%s %s(%s%s%s)%s wyszedł z IRC" +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 "%s%s: \"%s\" command received without channel" diff --git a/po/ru.po b/po/ru.po index ee80f42cb..55c26af28 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4246,6 +4246,18 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +#, fuzzy +msgid "display host in join messages" +msgstr "цвет текущего окна с сообщениями" + +#, fuzzy +msgid "display host in join messages from local client" +msgstr "цвет текущего окна с сообщениями" + +#, fuzzy +msgid "display host in part/quit messages" +msgstr "сообщение о выходе по-умолчанию" + msgid "display old topic when channel topic is changed" msgstr "" @@ -4353,6 +4365,10 @@ msgstr "цвет отошедших ников" msgid "color for channel modes, near channel name" msgstr "цвет имён при действиях" +#, fuzzy +msgid "color for reason in part/quit messages" +msgstr "сообщение о выходе по-умолчанию" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4626,7 +4642,7 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "%s не могу создать новый канал \"%s\"\n" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "%s%s %s(%s%s%s)%s зашёл на канал %s%s\n" #, fuzzy, c-format @@ -4666,19 +4682,19 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "%s%s%s теперь известен как %s%s\n" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" msgstr "%s%s %s(%s%s%s)%s покинул %s%s" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" msgstr "%s%s %s(%s%s%s)%s покинул %s%s" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" msgstr "%s%s %s(%s%s%s)%s вышел" #, fuzzy, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" +msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "%s%s %s(%s%s%s)%s вышел" #, fuzzy, c-format diff --git a/po/weechat.pot b/po/weechat.pot index 311402422..0deef9336 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-04 11:47+0200\n" +"POT-Creation-Date: 2010-06-08 14:51+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3631,6 +3631,15 @@ msgstr "" msgid "display CTCP message even if it is unknown CTCP" msgstr "" +msgid "display host in join messages" +msgstr "" + +msgid "display host in join messages from local client" +msgstr "" + +msgid "display host in part/quit messages" +msgstr "" + msgid "display old topic when channel topic is changed" msgstr "" @@ -3729,6 +3738,9 @@ msgstr "" msgid "color for channel modes, near channel name" msgstr "" +msgid "color for reason in part/quit messages" +msgstr "" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -3969,7 +3981,7 @@ msgid "%s%s: cannot create new channel \"%s\"" msgstr "" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has joined %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has joined %s%s%s" msgstr "" #, c-format @@ -4009,19 +4021,19 @@ msgid "%s%s%s%s is now known as %s%s%s" msgstr "" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s %s(%s%s%s)" msgstr "" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" +msgid "%s%s%s%s%s%s%s%s%s%s has left %s%s%s" msgstr "" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" +msgid "%s%s%s%s%s%s%s%s%s%s has quit %s(%s%s%s)" msgstr "" #, c-format -msgid "%s%s%s %s(%s%s%s)%s has quit" +msgid "%s%s%s%s%s%s%s%s%s%s has quit" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index be9b1dd29..4bf6d7347 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -78,6 +78,7 @@ #define IRC_COLOR_STATUS_NAME_SSL weechat_color("status_name_ssl") #define IRC_COLOR_MESSAGE_JOIN weechat_color(weechat_config_string(irc_config_color_message_join)) #define IRC_COLOR_MESSAGE_QUIT weechat_color(weechat_config_string(irc_config_color_message_quit)) +#define IRC_COLOR_REASON_QUIT weechat_color(weechat_config_string(irc_config_color_reason_quit)) #define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice)) #define IRC_COLOR_INPUT_NICK weechat_color(weechat_config_string(irc_config_color_input_nick)) #define IRC_COLOR_ITEM_AWAY weechat_color(weechat_config_string(irc_config_color_item_away)) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 1a9bf3f71..4ab40f65e 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -61,6 +61,9 @@ struct t_config_option *irc_config_look_display_away; struct t_config_option *irc_config_look_display_ctcp_blocked; struct t_config_option *irc_config_look_display_ctcp_reply; struct t_config_option *irc_config_look_display_ctcp_unknown; +struct t_config_option *irc_config_look_display_host_join; +struct t_config_option *irc_config_look_display_host_join_local; +struct t_config_option *irc_config_look_display_host_quit; struct t_config_option *irc_config_look_display_old_topic; struct t_config_option *irc_config_look_display_pv_away_once; struct t_config_option *irc_config_look_display_pv_back; @@ -93,6 +96,7 @@ struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_input_nick; struct t_config_option *irc_config_color_item_away; struct t_config_option *irc_config_color_item_channel_modes; +struct t_config_option *irc_config_color_reason_quit; /* IRC config, network section */ @@ -1529,6 +1533,24 @@ irc_config_init () N_("display CTCP message even if it is unknown CTCP"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_display_host_join = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_host_join", "boolean", + N_("display host in join messages"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_look_display_host_join_local = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_host_join_local", "boolean", + N_("display host in join messages from local client"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_look_display_host_quit = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_host_quit", "boolean", + N_("display host in part/quit messages"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_display_old_topic = weechat_config_new_option ( irc_config_file, ptr_section, "display_old_topic", "boolean", @@ -1716,6 +1738,12 @@ irc_config_init () N_("color for channel modes, near channel name"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, &irc_config_change_color_item_buffer_name, NULL, NULL, NULL); + irc_config_color_reason_quit = weechat_config_new_option ( + irc_config_file, ptr_section, + "reason_quit", "color", + N_("color for reason in part/quit messages"), + NULL, -1, 0, "default", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); /* network */ ptr_section = weechat_config_new_section (irc_config_file, "network", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 55a98d4cc..b5b06a1dd 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -80,6 +80,9 @@ extern struct t_config_option *irc_config_look_display_away; extern struct t_config_option *irc_config_look_display_ctcp_blocked; extern struct t_config_option *irc_config_look_display_ctcp_reply; extern struct t_config_option *irc_config_look_display_ctcp_unknown; +extern struct t_config_option *irc_config_look_display_host_join; +extern struct t_config_option *irc_config_look_display_host_join_local; +extern struct t_config_option *irc_config_look_display_host_quit; extern struct t_config_option *irc_config_look_display_old_topic; extern struct t_config_option *irc_config_look_display_pv_away_once; extern struct t_config_option *irc_config_look_display_pv_back; @@ -110,6 +113,7 @@ extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_input_nick; extern struct t_config_option *irc_config_color_item_away; extern struct t_config_option *irc_config_color_item_channel_modes; +extern struct t_config_option *irc_config_color_reason_quit; extern struct t_config_option *irc_config_network_autoreconnect_delay_growing; extern struct t_config_option *irc_config_network_autoreconnect_delay_max; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index d9f825aea..79e10d8de 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -539,7 +539,7 @@ IRC_PROTOCOL_CALLBACK(join) struct t_irc_nick *ptr_nick; struct t_irc_channel_speaking *ptr_nick_speaking; char *pos_channel; - int local_join; + int local_join, display_host; /* * JOIN message looks like: @@ -584,6 +584,9 @@ IRC_PROTOCOL_CALLBACK(join) ptr_nick_speaking = ((weechat_config_boolean (irc_config_look_smart_filter)) && (weechat_config_boolean (irc_config_look_smart_filter_join))) ? irc_channel_nick_speaking_time_search (ptr_channel, nick, 1) : NULL; + display_host = (local_join) ? + weechat_config_boolean (irc_config_look_display_host_join_local) : + weechat_config_boolean (irc_config_look_display_host_join); weechat_printf_tags (ptr_channel->buffer, irc_protocol_tags (command, (local_join @@ -591,14 +594,16 @@ IRC_PROTOCOL_CALLBACK(join) || !weechat_config_boolean (irc_config_look_smart_filter_join) || ptr_nick_speaking) ? NULL : "irc_smart_filter"), - _("%s%s%s %s(%s%s%s)%s has joined %s%s%s"), + _("%s%s%s%s%s%s%s%s%s%s has joined %s%s%s"), weechat_prefix ("join"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", IRC_COLOR_CHAT_HOST, - address, + (display_host) ? address : "", IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", IRC_COLOR_MESSAGE_JOIN, IRC_COLOR_CHAT_CHANNEL, pos_channel, @@ -1164,7 +1169,7 @@ IRC_PROTOCOL_CALLBACK(notice) IRC_PROTOCOL_CALLBACK(part) { char *pos_comment, *join_string; - int join_length, local_part; + int join_length, local_part, display_host; struct t_irc_channel *ptr_channel; struct t_irc_nick *ptr_nick; struct t_irc_channel_speaking *ptr_nick_speaking; @@ -1202,6 +1207,7 @@ IRC_PROTOCOL_CALLBACK(part) && (weechat_config_boolean (irc_config_look_smart_filter_quit))) ? irc_channel_nick_speaking_time_search (ptr_channel, nick, 1) : NULL; } + display_host = weechat_config_boolean (irc_config_look_display_host_quit); if (pos_comment) { weechat_printf_tags (ptr_channel->buffer, @@ -1212,21 +1218,23 @@ IRC_PROTOCOL_CALLBACK(part) || !weechat_config_boolean (irc_config_look_smart_filter_quit) || ptr_nick_speaking) ? NULL : "irc_smart_filter"), - _("%s%s%s %s(%s%s%s)%s has left %s%s%s " + _("%s%s%s%s%s%s%s%s%s%s has left %s%s%s " "%s(%s%s%s)"), weechat_prefix ("quit"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", IRC_COLOR_CHAT_HOST, - address, + (display_host) ? address : "", IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", IRC_COLOR_MESSAGE_QUIT, IRC_COLOR_CHAT_CHANNEL, ptr_channel->name, IRC_COLOR_MESSAGE_QUIT, IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_CHAT, + IRC_COLOR_REASON_QUIT, pos_comment, IRC_COLOR_CHAT_DELIMITERS); } @@ -1240,15 +1248,17 @@ IRC_PROTOCOL_CALLBACK(part) || !weechat_config_boolean (irc_config_look_smart_filter_quit) || ptr_nick_speaking) ? NULL : "irc_smart_filter"), - _("%s%s%s %s(%s%s%s)%s has left " + _("%s%s%s%s%s%s%s%s%s%s has left " "%s%s%s"), weechat_prefix ("quit"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", IRC_COLOR_CHAT_HOST, - address, + (display_host) ? address : "", IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", IRC_COLOR_MESSAGE_QUIT, IRC_COLOR_CHAT_CHANNEL, ptr_channel->name, @@ -1496,7 +1506,7 @@ IRC_PROTOCOL_CALLBACK(quit) struct t_irc_channel *ptr_channel; struct t_irc_nick *ptr_nick; struct t_irc_channel_speaking *ptr_nick_speaking; - int local_quit; + int local_quit, display_host; /* * QUIT message looks like: @@ -1534,6 +1544,7 @@ IRC_PROTOCOL_CALLBACK(quit) { ptr_channel->has_quit_server = 1; } + display_host = weechat_config_boolean (irc_config_look_display_host_quit); if (pos_comment && pos_comment[0]) { weechat_printf_tags (ptr_channel->buffer, @@ -1544,19 +1555,21 @@ IRC_PROTOCOL_CALLBACK(quit) || !weechat_config_boolean (irc_config_look_smart_filter_quit) || ptr_nick_speaking) ? NULL : "irc_smart_filter"), - _("%s%s%s %s(%s%s%s)%s has quit " + _("%s%s%s%s%s%s%s%s%s%s has quit " "%s(%s%s%s)"), weechat_prefix ("quit"), (ptr_channel->type == IRC_CHANNEL_TYPE_PRIVATE) ? irc_nick_color_for_pv (ptr_channel, nick) : IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", IRC_COLOR_CHAT_HOST, - address, + (display_host) ? address : "", IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", IRC_COLOR_MESSAGE_QUIT, IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_CHAT, + IRC_COLOR_REASON_QUIT, pos_comment, IRC_COLOR_CHAT_DELIMITERS); } @@ -1570,15 +1583,17 @@ IRC_PROTOCOL_CALLBACK(quit) || !weechat_config_boolean (irc_config_look_smart_filter_quit) || ptr_nick_speaking) ? NULL : "irc_smart_filter"), - _("%s%s%s %s(%s%s%s)%s has quit"), + _("%s%s%s%s%s%s%s%s%s%s has quit"), weechat_prefix ("quit"), (ptr_channel->type == IRC_CHANNEL_TYPE_PRIVATE) ? irc_nick_color_for_pv (ptr_channel, nick) : IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? " (" : "", IRC_COLOR_CHAT_HOST, - address, + (display_host) ? address : "", IRC_COLOR_CHAT_DELIMITERS, + (display_host) ? ")" : "", IRC_COLOR_MESSAGE_QUIT); } }