diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | doc/en/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_options.txt | 7 | ||||
| -rw-r--r-- | po/cs.po | 21 | ||||
| -rw-r--r-- | po/de.po | 21 | ||||
| -rw-r--r-- | po/es.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 67 | ||||
| -rw-r--r-- | po/hu.po | 23 | ||||
| -rw-r--r-- | po/it.po | 97 | ||||
| -rw-r--r-- | po/pl.po | 22 | ||||
| -rw-r--r-- | po/ru.po | 23 | ||||
| -rw-r--r-- | po/weechat.pot | 14 | ||||
| -rw-r--r-- | src/plugins/irc/irc-channel.c | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-channel.h | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 9 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.h | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-ctcp.c | 2 | ||||
| -rw-r--r-- | src/plugins/irc/irc-nick.c | 34 | ||||
| -rw-r--r-- | src/plugins/irc/irc-nick.h | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 180 |
20 files changed, 237 insertions, 329 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode <flashcode@flashtux.org> -v0.3.1-dev, 2009-11-16 +v0.3.1-dev, 2009-11-19 Version 0.3.1 (under dev!) @@ -25,6 +25,7 @@ Version 0.3.1 (under dev!) * irc: use self-signed certificate to auto identify on IRC server (CertFP) (task #7492) * irc: check SSL certificates (task #7492) +* irc: add option to use same nick color in channel and private (task #9870) * irc: add missing command 275 (patch #6952) * irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770) * irc: add options for CTCP, to block/customize CTCP reply (task #9693) diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 95c6ab1a7..a4ad6c199 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -33,6 +33,11 @@ ** type: boolean ** values: on, off (default value: on) +* *irc.look.color_pv_nick_like_channel* +** description: use same nick color for channel and private +** type: boolean +** values: on, off (default value: on) + * *irc.look.display_away* ** description: display message when (un)marking as away ** type: integer @@ -141,7 +146,7 @@ * *irc.network.away_check_max_nicks* ** description: do not check away nicks on channels with high number of nicks (0 = unlimited) ** type: integer -** values: 0 .. 2147483647 (default value: 0) +** values: 0 .. 2147483647 (default value: 25) * *irc.network.colors_receive* ** description: when off, colors codes are ignored in incoming messages diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 9ada8d1d5..2428cf286 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -33,6 +33,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: on) +* *irc.look.color_pv_nick_like_channel* +** description: utiliser la même couleur de pseudo pour le canal et le privé +** type: booléen +** valeurs: on, off (valeur par défaut: on) + * *irc.look.display_away* ** description: affiche un message pour l'absence/le retour ** type: entier @@ -141,7 +146,7 @@ * *irc.network.away_check_max_nicks* ** description: ne pas vérifier les pseudos absents lorsqu'il y a un nombre important de pseudos (0 = pas de limite) ** type: entier -** valeurs: 0 .. 2147483647 (valeur par défaut: 0) +** valeurs: 0 .. 2147483647 (valeur par défaut: 25) * *irc.network.colors_receive* ** description: si désactivé, les codes couleurs des messages entrants sont ignorés @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-09-14 10:56+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3956,6 +3956,10 @@ msgstr "%s%s: chyba při vytváření volby serveru \"%s\"" msgid "use nick color in messages from server" msgstr "použít barvu přezdívky ve zprávách ze serveru" +#, fuzzy +msgid "use same nick color for channel and private" +msgstr "barva textu pro jiné přezdívky v soukromém bufferu" + msgid "merge server buffers" msgstr "spojit buffery serverů" @@ -4248,14 +4252,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s%s: %s" - -#, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sNeznámý CTCP %s%s%s obdržen od %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)" @@ -4751,7 +4747,6 @@ msgstr "Loguji buffery:" msgid "logging (level: %d)" msgstr "logování (úroveň: %d)" -#, c-format msgid "not logging" msgstr "neloguji" @@ -5818,6 +5813,12 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s%s: %s" + +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "%sNeznámý CTCP %s%s%s obdržen od %s%s%s" + #~ msgid "list of %s scripts" #~ msgstr "seznam %s skriptů" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-11-17 00:01+0100\n" "Last-Translator: Nils G <weechatter@arcor.de>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4084,6 +4084,10 @@ msgstr "%s%s: Fehler bei der Erstellung der Server-Option \"%s\"" msgid "use nick color in messages from server" msgstr "Nutze Nick-Farbe bei Nachrichten vom Server" +#, fuzzy +msgid "use same nick color for channel and private" +msgstr "Farbe des anderen Nicknamens in einem privaten Buffer" + msgid "merge server buffers" msgstr "Server-Buffer zusammenlegen" @@ -4386,14 +4390,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sUnbekannter CTCP %s%s%s empfangen von %s%s%s : %s" - -#, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sUnbekannter CTCP %s%s%s von %s%s%s empfangen" - -#, 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)" @@ -4892,7 +4888,6 @@ msgstr "Protokollieren der Buffer:" msgid "logging (level: %d)" msgstr "Protokolliere (Level: %d)" -#, c-format msgid "not logging" msgstr "nicht protokolliert" @@ -5990,6 +5985,12 @@ msgstr "%s%s: kann die \"nonblock\"-Option für den Socket nicht festlegen" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "%sUnbekannter CTCP %s%s%s empfangen von %s%s%s : %s" + +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "%sUnbekannter CTCP %s%s%s von %s%s%s empfangen" + #~ msgid "list of %s scripts" #~ msgstr "Liste der %s Skripten" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3773,6 +3773,10 @@ msgstr "%s%s: error al crear la opción \"%s\" del servidor" msgid "use nick color in messages from server" msgstr "usar color del apodo en mensajes del servidor" +#, fuzzy +msgid "use same nick color for channel and private" +msgstr "color para el otro apodo en una conversación privada" + msgid "merge server buffers" msgstr "unir buffers de los servidores" @@ -4073,14 +4077,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sCTCP desconocido %s%s%s recibido de %s%s%s: %s" - -#, fuzzy, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sCTCP desconocido %s%s%s recibido de %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)" @@ -4586,7 +4582,6 @@ msgstr "Lista de alias:\n" msgid "logging (level: %d)" msgstr "guardando registro (nivel: %d)" -#, c-format msgid "not logging" msgstr "" @@ -5677,6 +5672,13 @@ msgstr "%s no es posible crear el servidor\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s falta un argumento para la opción --dir\n" +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "%sCTCP desconocido %s%s%s recibido de %s%s%s: %s" + +#, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "%sCTCP desconocido %s%s%s recibido de %s%s" + #, fuzzy #~ msgid "list of %s scripts" #~ msgstr "Lista de alias:\n" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" -"PO-Revision-Date: 2009-11-18 16:01+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" +"PO-Revision-Date: 2009-11-19 14:35+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -4043,6 +4043,9 @@ msgstr "%s%s: erreur de création de l'option serveur \"%s\"" msgid "use nick color in messages from server" msgstr "utiliser la couleur du pseudo dans les messages du serveur" +msgid "use same nick color for channel and private" +msgstr "utiliser la même couleur de pseudo pour le canal et le privé" + msgid "merge server buffers" msgstr "mélange des tampons de serveur" @@ -4343,14 +4346,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sCTCP inconnu %s%s%s reçu de %s%s%s: %s" - -#, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sCTCP inconnu %s%s%s reçu de %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)" @@ -4845,7 +4840,6 @@ msgstr "Enregistrement des tampons:" msgid "logging (level: %d)" msgstr "enregistrement (niveau: %d)" -#, c-format msgid "not logging" msgstr "pas d'enregistrement" @@ -5941,54 +5935,3 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" - -#~ msgid "list of %s scripts" -#~ msgstr "liste des scripts %s" - -#~ msgid "%s%s: bind error on port %d" -#~ msgstr "%s%s: erreur de bind sur le port %d (%s.%s)" - -#~ msgid "%s: new client @ %s" -#~ msgstr "%s: nouveau client @ %s" - -#~ msgid "enable relay" -#~ msgstr "activer le relai" - -#~ msgid "" -#~ "port number (or range of ports) that relay plugin listens on (syntax: a " -#~ "single port, ie. 5000 or a port range, ie. 5000-5015, it's recommended to " -#~ "use ports greater than 1024, because only root can use ports below 1024)" -#~ msgstr "" -#~ "restreint les fichiers/discussions sortants à utiliser des ports dans " -#~ "l'intervalle donné (pratique pour le NAT) (syntaxe: un port simple, par " -#~ "exemple 5000, un intervalle de ports, par exemple 5000-5015, si non " -#~ "renseigné tout port peut être utilisé, il est recommandé d'utiliser des " -#~ "ports supérieurs à 1024, car seul root peut utiliser les ports en dessous " -#~ "de 1024)" - -#~ msgid "%s%s: option \"listen_port_range\" is not defined" -#~ msgstr "%s%s: l'option \"listen_port_range\" n'est pas définie" - -#~ msgid "%s%s: cannot find available port for listening" -#~ msgstr "%s%s: impossible de trouver un port disponible pour écouter" - -#~ msgid "" -#~ " list: list relay clients\n" -#~ "listfull: list relay clients (verbose)\n" -#~ "\n" -#~ "Without argument, this command opens buffer with list of relay clients." -#~ msgstr "" -#~ " list: liste les clients pour le relai\n" -#~ "listfull: liste les clients pour le relai (verbeux)\n" -#~ "\n" -#~ "Sans paramètre, cette commande ouvre le tampon avec la liste des clients " -#~ "pour le relai." - -#~ msgid "" -#~ " channel: channel where user is\n" -#~ "nickname: nickname to kick and ban\n" -#~ " comment: comment for kick" -#~ msgstr "" -#~ " canal: canal où l'utilisateur se trouve\n" -#~ " pseudo: pseudo à éliminer et bannir\n" -#~ "commentaire: commentaire pour l'élimination" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-09-20 13:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3904,6 +3904,10 @@ msgid "use nick color in messages from server" msgstr "helyi idő lekérdezése a szerverről" #, fuzzy +msgid "use same nick color for channel and private" +msgstr "másik fél nevének színe privát beszélgetésben" + +#, fuzzy msgid "merge server buffers" msgstr "pufferek kezelése" @@ -4201,14 +4205,6 @@ msgid "%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 "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s" - -#, fuzzy, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s" - -#, fuzzy, 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 kilépett" @@ -4690,7 +4686,6 @@ msgstr "Aliaszok listája:\n" msgid "logging (level: %d)" msgstr "" -#, c-format msgid "not logging" msgstr "" @@ -5762,6 +5757,14 @@ msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" #, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s" + +#, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s" + +#, fuzzy #~ msgid "list of %s scripts" #~ msgstr "Aliaszok listája:\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.31-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-11-18 21:26+0100\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -679,7 +679,8 @@ msgstr[1] "giorni" #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" -msgstr "Uptime di WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, avviato il %s%s" +msgstr "" +"Uptime di WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, avviato il %s%s" msgid "compiled on" msgstr "compilato il" @@ -993,8 +994,8 @@ msgstr "" " -all: elimina tutti i filtri\n" "plugin.buffer: plugin e buffer in cui il filtro è attivo (\"*\" per tutti i " "buffer)\n" -" tag: elenco di tag separati da virgole, per esempio: " -"\"irc_join,irc_part,irc_quit\"\n" +" tag: elenco di tag separati da virgole, per esempio: \"irc_join," +"irc_part,irc_quit\"\n" " regex: espressione regolare da cercare nella riga (utilizzare \\t " "per separare il prefisso dal messaggio, caratteri speciali come \"|\" devono " "essere preceduti dal carattere escape: '\\|')\n" @@ -1051,7 +1052,9 @@ msgid "bind/unbind keys" msgstr "associa/disassocia tasti" msgid "[bind key [command [args]]] | [unbind key] | [reset -yes] | [missing]" -msgstr "[bind tasto [comando [argomenti]]] | [unbind tasto] | [reset -yes] | [missing]" +msgstr "" +"[bind tasto [comando [argomenti]]] | [unbind tasto] | [reset -yes] | " +"[missing]" msgid "" " bind: bind a command to a key or display command bound to key\n" @@ -1177,8 +1180,8 @@ msgstr "" " password: password (opzionale)\n" " del: elimina un proxy (o tutti i proxy con -all)\n" " set: imposta un valore per una proprietà del proxy\n" -" opzione: opzione da modificare (per un elenco di opzioni, consultare " -"/set weechat.proxy.<nome_proxy>.*)\n" +" opzione: opzione da modificare (per un elenco di opzioni, consultare /" +"set weechat.proxy.<nome_proxy>.*)\n" " valore: nuovo valore per l'opzione\n" " list: elenca tutti i proxy\n" "\n" @@ -1465,7 +1468,8 @@ msgid "command executed when WeeChat starts, after loading plugins" msgstr "comando eseguito all'avvio di WeeChat, dopo il caricamento dei plugin" msgid "command executed when WeeChat starts, before loading plugins" -msgstr "comando eseguito all'avvio di WeeChat, prima del caricamento dei plugin" +msgstr "" +"comando eseguito all'avvio di WeeChat, prima del caricamento dei plugin" msgid "display WeeChat logo at startup" msgstr "visualizza il logo di WeeChat all'avvio" @@ -2110,7 +2114,8 @@ msgstr "%s sorgente: %s, riga: %d" #, c-format msgid "%s *** Please report above info to developers ***" -msgstr "%s *** Per favore inviare le precedenti informazioni agli sviluppatori ***" +msgstr "" +"%s *** Per favore inviare le precedenti informazioni agli sviluppatori ***" msgid "write - object type" msgstr "scrittura - tipo oggetto" @@ -2537,7 +2542,8 @@ msgstr "" #, c-format msgid "%s: warning: dictionary \"%s\" is not available on your system" -msgstr "%s: attenzione: il dizionario \"%s\" non è disponibile su questo sistema" +msgstr "" +"%s: attenzione: il dizionario \"%s\" non è disponibile su questo sistema" #, c-format msgid "%s%s: not enough memory to create new speller" @@ -2545,7 +2551,8 @@ msgstr "%s%s: memoria non sufficiente per creare un nuovo controllore" #, c-format msgid "%s%s: error creating charset \"%s\" => \"%s\"" -msgstr "%s%s: errore durante la creazione del set di caratteri \"%s\" => \"%s\"" +msgstr "" +"%s%s: errore durante la creazione del set di caratteri \"%s\" => \"%s\"" msgid "global decoding charset" msgstr "set di caratteri per la decodifica globale" @@ -2735,7 +2742,8 @@ msgstr "" #, c-format msgid "" "%s%s: disconnected from %d %s (SSL connection not supported with upgrade)" -msgstr "%s%s: disconnesso da %d %s (connessione SSL non supportata con l'upgrade)" +msgstr "" +"%s%s: disconnesso da %d %s (connessione SSL non supportata con l'upgrade)" #, c-format msgid "%s%s: error with server from URL (\"%s\"), ignored" @@ -2767,7 +2775,8 @@ msgstr "%s: prossima assenza rimossa" #, c-format msgid "%s%s: \"%s\" command can only be executed in a channel buffer" -msgstr "%s%s: il comando \"%s\" può essere eseguito solamente sul buffer del canale" +msgstr "" +"%s%s: il comando \"%s\" può essere eseguito solamente sul buffer del canale" #, c-format msgid "%s%s: already connected to server \"%s\"!" @@ -3003,8 +3012,8 @@ msgid "" "message: message for away (if no message is given, away status is removed)" msgstr "" " -all: attiva/disattiva lo stato di assenza su tutti i server connessi\n" -"messaggio: messaggio di assenza (se non specificato, lo stato di " -"assenza viene rimosso)" +"messaggio: messaggio di assenza (se non specificato, lo stato di assenza " +"viene rimosso)" msgid "ban nicks or hosts" msgstr "banna nick oppure host" @@ -3931,10 +3940,12 @@ msgid "use SSL for server communication" msgstr "utilizza SSL per le comunicazioni col server" msgid "ssl certificate file used to automatically identify your nick" -msgstr "certificato ssl utilizzato per identificare automaticamente il proprio nick" +msgstr "" +"certificato ssl utilizzato per identificare automaticamente il proprio nick" msgid "size of the key used during the Diffie-Hellman Key Exchange" -msgstr "dimensione della chiave utilizzata durante lo Scambio Chiavi Diffie-Hellman" +msgstr "" +"dimensione della chiave utilizzata durante lo Scambio Chiavi Diffie-Hellman" msgid "check that the ssl connection is fully trusted" msgstr "verifica che la connessione ssl sia totalmente fidata" @@ -4005,6 +4016,10 @@ msgstr "%s%s: errore durante la creazione dell'opzione del server \"%s\"" msgid "use nick color in messages from server" msgstr "utilizza i colori dei nick nei messaggi dal server" +#, fuzzy +msgid "use same nick color for channel and private" +msgstr "colore del testo per gli altri nick nel buffer privato" + msgid "merge server buffers" msgstr "unisci i buffer dei server" @@ -4021,7 +4036,9 @@ msgid "text to display after nick in chat window" msgstr "testo da visualizzare dopo il nick nella finestra di chat" msgid "smart completion for nicks (completes first with last speakers)" -msgstr "completamento intelligente per i nick (usando prima chi ha parlato per ultimo)" +msgstr "" +"completamento intelligente per i nick (usando prima chi ha parlato per " +"ultimo)" msgid "display message when (un)marking as away" msgstr "visualizza messaggio al cambio dello stato di assenza" @@ -4119,27 +4136,33 @@ msgstr "" "sostituito dalla versione di WeeChat)" msgid "interval between two checks for away (in minutes, 0 = never check)" -msgstr "intervallo tra le due verifiche per l'assenza (in minuti, 0 = nessun check)" +msgstr "" +"intervallo tra le due verifiche per l'assenza (in minuti, 0 = nessun check)" msgid "" "do not check away nicks on channels with high number of nicks (0 = unlimited)" msgstr "" -"non verificare l'assenza su canali con un elevato numero di nick (0 = illimitato)" +"non verificare l'assenza su canali con un elevato numero di nick (0 = " +"illimitato)" msgid "interval between two checks for lag (in seconds, 0 = never check)" -msgstr "intervallo tra le due verifiche per il ritardo (in secondi, 0 = nessun controllo)" +msgstr "" +"intervallo tra le due verifiche per il ritardo (in secondi, 0 = nessun " +"controllo)" msgid "minimum lag to show (in seconds)" msgstr "ritardo minimo da visualizzare (in secondi)" msgid "disconnect after important lag (in minutes, 0 = never disconnect)" -msgstr "disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)" +msgstr "" +"disconnetti dopo un ritardo eccessivo (in minuti, 0 = nessuna disconnessione)" msgid "anti-flood: # seconds between two user messages (0 = no anti-flood)" msgstr "anti-flood: # secondi tra due messaggi utente (0 = nessun anti-flood)" msgid "when off, colors codes are ignored in incoming messages" -msgstr "quando disabilitato, i codici colori vengono ignorati nei messaggi in entrata" +msgstr "" +"quando disabilitato, i codici colori vengono ignorati nei messaggi in entrata" msgid "" "allow user to send colors with special codes (ctrl-c + a code and optional " @@ -4297,14 +4320,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sCTCP %s%s%s sconosciuto ricevuto da %s%s%s: %s" - -#, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sCTCP %s%s%s sconosciuto ricevuto 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)" @@ -4634,7 +4649,9 @@ msgstr "%s%s: memoria non sufficiente" #, c-format msgid "gnutls: connected using %d-bit Diffie-Hellman shared secret exchange" -msgstr "gnutls: connesso utilizzando lo scambio segreto condiviso %d-bit Diffie-Hellman" +msgstr "" +"gnutls: connesso utilizzando lo scambio segreto condiviso %d-bit Diffie-" +"Hellman" #, c-format msgid "%sgnutls: error while checking peer's certificate" @@ -4690,15 +4707,18 @@ msgstr "%sgnutls: impossibile leggere il certificato \"%s\"" #, c-format msgid "%s%s: addresses not defined for server \"%s\", cannot connect" -msgstr "%s%s: indirizzo non definito per il server \"%s\", impossibile connettersi" +msgstr "" +"%s%s: indirizzo non definito per il server \"%s\", impossibile connettersi" #, c-format msgid "%s%s: proxy \"%s\" not found for server \"%s\", cannot connect" -msgstr "%s%s: proxy \"%s\" non trovato per il server \"%s\", impossibile connettersi" +msgstr "" +"%s%s: proxy \"%s\" non trovato per il server \"%s\", impossibile connettersi" #, c-format msgid "%s%s: missing proxy settings, check options for proxy \"%s\"" -msgstr "%s%s: impostazioni proxy mancanti, verificare le opzioni per il proxy \"%s\"" +msgstr "" +"%s%s: impostazioni proxy mancanti, verificare le opzioni per il proxy \"%s\"" #, c-format msgid "%s%s: nicks not defined for server \"%s\", cannot connect" @@ -4792,7 +4812,6 @@ msgstr "Logging sui buffer:" msgid "logging (level: %d)" msgstr "logging (livello: %d)" -#, c-format msgid "not logging" msgstr "nessun logging" @@ -5873,6 +5892,12 @@ msgstr "%s%s: impossibile impostare l'opzione \"nonblock\" per il socket" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: timeout per \"%s\" con %s" +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "%sCTCP %s%s%s sconosciuto ricevuto da %s%s%s: %s" + +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "%sCTCP %s%s%s sconosciuto ricevuto da %s%s%s" + #~ msgid "list of %s scripts" #~ msgstr "elenco degli script %s" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: Polish\n" @@ -3997,6 +3997,10 @@ msgstr "%s%s: błąd podczas tworzenia opcji dla serwera \"%s\"" msgid "use nick color in messages from server" msgstr "użyj koloru nicka w wiadomościach od serwera" +#, fuzzy +msgid "use same nick color for channel and private" +msgstr "kolor innego nicka w prywatnym buforze" + msgid "merge server buffers" msgstr "połącz bufory serwerów" @@ -4295,14 +4299,6 @@ 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" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s%s: %s" - -#, fuzzy, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "%sNieznane CTCP %s%s%s otrzymano od %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)" @@ -4803,7 +4799,6 @@ msgstr "Loguję w buforach:" msgid "logging (level: %d)" msgstr "logowanie (poziom: %d)" -#, c-format msgid "not logging" msgstr "nie loguję" @@ -5875,6 +5870,13 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s%s: %s" + +#, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "%sNieznane CTCP %s%s%s otrzymano od %s%s" + #~ msgid "list of %s scripts" #~ msgstr "lista skryptów %s " @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: 2009-09-20 13:50+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3905,6 +3905,10 @@ msgid "use nick color in messages from server" msgstr "запросить местное время сервера" #, fuzzy +msgid "use same nick color for channel and private" +msgstr "цвет ника собеседника в окне привата" + +#, fuzzy msgid "merge server buffers" msgstr "управление буферами" @@ -4203,14 +4207,6 @@ msgid "%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 "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "Получен неизвестный CTCP %s%s%s от %s%s" - -#, fuzzy, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "Получен неизвестный CTCP %s%s%s от %s%s" - -#, fuzzy, 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 вышел" @@ -4695,7 +4691,6 @@ msgstr "Список сокращений:\n" msgid "logging (level: %d)" msgstr "" -#, c-format msgid "not logging" msgstr "" @@ -5760,6 +5755,14 @@ msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" #, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" +#~ msgstr "Получен неизвестный CTCP %s%s%s от %s%s" + +#, fuzzy +#~ msgid "%sUnknown CTCP %s%s%s received from %s%s%s" +#~ msgstr "Получен неизвестный CTCP %s%s%s от %s%s" + +#, fuzzy #~ msgid "list of %s scripts" #~ msgstr "Список сокращений:\n" diff --git a/po/weechat.pot b/po/weechat.pot index 5cee94e03..399218fc9 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: 2009-11-07 13:09+0100\n" +"POT-Creation-Date: 2009-11-19 14:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3314,6 +3314,9 @@ msgstr "" msgid "use nick color in messages from server" msgstr "" +msgid "use same nick color for channel and private" +msgstr "" + msgid "merge server buffers" msgstr "" @@ -3581,14 +3584,6 @@ msgid "%s%s%s %s(%s%s%s)%s has left %s%s%s" msgstr "" #, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s: %s" -msgstr "" - -#, c-format -msgid "%sUnknown CTCP %s%s%s received from %s%s%s" -msgstr "" - -#, c-format msgid "%s%s%s %s(%s%s%s)%s has quit %s(%s%s%s)" msgstr "" @@ -4049,7 +4044,6 @@ msgstr "" msgid "logging (level: %d)" msgstr "" -#, c-format msgid "not logging" msgstr "" diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index 8dc9c06ca..822259159 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -243,6 +243,7 @@ irc_channel_new (struct t_irc_server *server, int channel_type, new_channel->cycle = 0; new_channel->display_creation_date = 0; new_channel->nick_completion_reset = 0; + new_channel->pv_remote_nick_color = NULL; new_channel->nicks_count = 0; new_channel->nicks = NULL; new_channel->last_nick = NULL; @@ -652,6 +653,8 @@ irc_channel_free (struct t_irc_server *server, struct t_irc_channel *channel) irc_nick_free_all (channel); if (channel->away_message) free (channel->away_message); + if (channel->pv_remote_nick_color) + free (channel->pv_remote_nick_color); if (channel->nicks_speaking[0]) weechat_list_free (channel->nicks_speaking[0]); if (channel->nicks_speaking[1]) @@ -722,6 +725,8 @@ irc_channel_add_to_infolist (struct t_infolist *infolist, return 0; if (!weechat_infolist_new_var_string (ptr_item, "key", channel->key)) return 0; + if (!weechat_infolist_new_var_string (ptr_item, "pv_remote_nick_color", channel->pv_remote_nick_color)) + return 0; if (!weechat_infolist_new_var_integer (ptr_item, "nicks_count", channel->nicks_count)) return 0; if (!weechat_infolist_new_var_integer (ptr_item, "checking_away", channel->checking_away)) @@ -799,6 +804,7 @@ irc_channel_print_log (struct t_irc_channel *channel) weechat_log_printf (" cycle. . . . . . . . . . : %d", channel->cycle); weechat_log_printf (" display_creation_date. . : %d", channel->display_creation_date); weechat_log_printf (" nick_completion_reset. . : %d", channel->nick_completion_reset); + weechat_log_printf (" pv_remote_nick_color . . : '%s'", channel->pv_remote_nick_color); weechat_log_printf (" nicks_count. . . . . . . : %d", channel->nicks_count); weechat_log_printf (" nicks. . . . . . . . . . : 0x%lx", channel->nicks); weechat_log_printf (" last_nick. . . . . . . . : 0x%lx", channel->last_nick); diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h index d1f08ff5a..031625c58 100644 --- a/src/plugins/irc/irc-channel.h +++ b/src/plugins/irc/irc-channel.h @@ -53,6 +53,7 @@ struct t_irc_channel int display_creation_date; /* 1 for displaying creation date */ int nick_completion_reset; /* 1 for resetting nick completion */ /* there was some join/part on chan */ + char *pv_remote_nick_color; /* color for remote nick in pv */ int nicks_count; /* # nicks on channel (0 if pv) */ struct t_irc_nick *nicks; /* nicks on the channel */ struct t_irc_nick *last_nick; /* last nick on the channel */ diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index c246958aa..0ea853566 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -45,6 +45,7 @@ struct t_config_section *irc_config_section_server = NULL; /* IRC config, look section */ struct t_config_option *irc_config_look_color_nicks_in_server_messages; +struct t_config_option *irc_config_look_color_pv_nick_like_channel; struct t_config_option *irc_config_look_server_buffer; struct t_config_option *irc_config_look_open_channel_near_server; struct t_config_option *irc_config_look_open_pv_near_server; @@ -150,7 +151,7 @@ irc_config_change_look_color_nicks_number (void *data, const char *option, for (ptr_nick = ptr_channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) { - ptr_nick->color = irc_nick_find_color (ptr_nick); + ptr_nick->color = irc_nick_find_color (ptr_nick->name); } } } @@ -1227,6 +1228,12 @@ irc_config_init () N_("use nick color in messages from server"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_color_pv_nick_like_channel = weechat_config_new_option ( + irc_config_file, ptr_section, + "color_pv_nick_like_channel", "boolean", + N_("use same nick color for channel and private"), + NULL, 0, 0, "on", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_server_buffer = weechat_config_new_option ( irc_config_file, ptr_section, "server_buffer", "integer", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 47cc1696f..3b83e18f8 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -62,6 +62,7 @@ extern struct t_config_section *irc_config_section_server_default; extern struct t_config_section *irc_config_section_server; extern struct t_config_option *irc_config_look_color_nicks_in_server_messages; +extern struct t_config_option *irc_config_look_color_pv_nick_like_channel; extern struct t_config_option *irc_config_look_server_buffer; extern struct t_config_option *irc_config_look_open_channel_near_server; extern struct t_config_option *irc_config_look_open_pv_near_server; diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index cfdf75cdf..4bcc66480 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -883,7 +883,7 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, "%s%s%s%s%s%s", weechat_prefix ("action"), (nick_is_me) ? - IRC_COLOR_CHAT_NICK_SELF : IRC_COLOR_CHAT_NICK_OTHER, + IRC_COLOR_CHAT_NICK_SELF : irc_nick_color_for_pv (ptr_channel, nick), nick, (pos_args) ? IRC_COLOR_CHAT : "", (pos_args) ? " " : "", diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index c87c7fd3a..1a0519b07 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -61,15 +61,15 @@ irc_nick_valid (struct t_irc_channel *channel, struct t_irc_nick *nick) */ const char * -irc_nick_find_color (struct t_irc_nick *nick) +irc_nick_find_color (const char *nickname) { int i, color; char color_name[64]; color = 0; - for (i = strlen (nick->name) - 1; i >= 0; i--) + for (i = strlen (nickname) - 1; i >= 0; i--) { - color += (int)(nick->name[i]); + color += (int)(nickname[i]); } color = (color % weechat_config_integer (weechat_config_get ("weechat.look.color_nicks_number"))); @@ -179,7 +179,7 @@ irc_nick_get_gui_infos (struct t_irc_nick *nick, struct t_irc_nick * irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, - const char *nick_name, int is_chanowner, int is_chanadmin, + const char *nickname, int is_chanowner, int is_chanadmin, int is_chanadmin2, int is_op, int is_halfop, int has_voice, int is_chanuser, int is_away) { @@ -189,7 +189,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, struct t_gui_nick_group *ptr_group; /* nick already exists on this channel? */ - ptr_nick = irc_nick_search (channel, nick_name); + ptr_nick = irc_nick_search (channel, nickname); if (ptr_nick) { /* remove old nick from nicklist */ @@ -232,7 +232,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, return NULL; /* initialize new nick */ - new_nick->name = strdup (nick_name); + new_nick->name = strdup (nickname); new_nick->host = NULL; new_nick->flags = 0; IRC_NICK_SET_FLAG(new_nick, is_chanowner, IRC_NICK_CHANOWNER); @@ -246,7 +246,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, if (weechat_strcasecmp (new_nick->name, server->nick) == 0) new_nick->color = IRC_COLOR_CHAT_NICK_SELF; else - new_nick->color = irc_nick_find_color (new_nick); + new_nick->color = irc_nick_find_color (new_nick->name); /* add nick to end of list */ new_nick->prev_nick = channel->last_nick; @@ -311,7 +311,7 @@ irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel, if (nick_is_me) nick->color = IRC_COLOR_CHAT_NICK_SELF; else - nick->color = irc_nick_find_color (nick); + nick->color = irc_nick_find_color (nick->name); /* add nick in nicklist */ prefix[0] = ' '; @@ -580,6 +580,24 @@ irc_nick_as_prefix (struct t_irc_nick *nick, const char *nickname, } /* + * irc_nick_color_for_pv: return string with color of nick for private + */ + +const char * +irc_nick_color_for_pv (struct t_irc_channel *channel, const char *nickname) +{ + if (weechat_config_boolean (irc_config_look_color_pv_nick_like_channel)) + { + if (!channel->pv_remote_nick_color) + channel->pv_remote_nick_color = strdup (irc_nick_find_color (nickname)); + if (channel->pv_remote_nick_color) + return channel->pv_remote_nick_color; + } + + return IRC_COLOR_CHAT_NICK_OTHER; +} + +/* * irc_nick_add_to_infolist: add a nick in an infolist * return 1 if ok, 0 if error */ diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h index af1f556e0..985582583 100644 --- a/src/plugins/irc/irc-nick.h +++ b/src/plugins/irc/irc-nick.h @@ -61,10 +61,10 @@ struct t_irc_nick extern int irc_nick_valid (struct t_irc_channel *channel, struct t_irc_nick *nick); -extern const char *irc_nick_find_color (struct t_irc_nick *nick); +extern const char *irc_nick_find_color (const char *nickname); extern struct t_irc_nick *irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, - const char *nick_name, + const char *nickname, int is_chanowner, int is_chanadmin, int is_chanadmin2, @@ -90,6 +90,8 @@ extern void irc_nick_set_away (struct t_irc_channel *channel, struct t_irc_nick *nick, int is_away); extern char *irc_nick_as_prefix (struct t_irc_nick *nick, const char *nickname, const char *force_color); +extern const char * irc_nick_color_for_pv (struct t_irc_channel *channel, + const char *nickname); extern int irc_nick_add_to_infolist (struct t_infolist *infolist, struct t_irc_nick *nick); extern void irc_nick_print_log (struct t_irc_nick *nick); diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 7766a7d19..fe6d6413c 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -665,6 +665,11 @@ irc_protocol_cmd_nick (struct t_irc_server *server, const char *command, { free (ptr_channel->name); ptr_channel->name = strdup (new_nick); + if (ptr_channel->pv_remote_nick_color) + { + free (ptr_channel->pv_remote_nick_color); + ptr_channel->pv_remote_nick_color = NULL; + } buffer_name = irc_buffer_build_name (server->name, ptr_channel->name); weechat_buffer_set (ptr_channel->buffer, "name", buffer_name); weechat_buffer_set (ptr_channel->buffer, "short_name", ptr_channel->name); @@ -1081,7 +1086,7 @@ int irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, int argc, char **argv, char **argv_eol) { - char *pos_args, *pos_end_01, *pos, *pos_message; + char *pos_args; const char *remote_nick; int nick_is_me; struct t_irc_channel *ptr_channel; @@ -1180,157 +1185,40 @@ irc_protocol_cmd_privmsg (struct t_irc_server *server, const char *command, ptr_channel = irc_channel_search (server, remote_nick); - if (strncmp (pos_args, "\01ACTION ", 8) == 0) + if (!irc_ignore_check (server, ptr_channel, remote_nick, host)) { - if (!irc_ignore_check (server, ptr_channel, remote_nick, host)) + if (!ptr_channel) { + ptr_channel = irc_channel_new (server, + IRC_CHANNEL_TYPE_PRIVATE, + remote_nick, 0, 0); if (!ptr_channel) { - ptr_channel = irc_channel_new (server, - IRC_CHANNEL_TYPE_PRIVATE, - remote_nick, 0, 0); - if (!ptr_channel) - { - weechat_printf (server->buffer, - _("%s%s: cannot create new " - "private buffer \"%s\""), - weechat_prefix ("error"), - IRC_PLUGIN_NAME, remote_nick); - return WEECHAT_RC_ERROR; - } - } - if (!ptr_channel->topic) - irc_channel_set_topic (ptr_channel, address); - - pos_args += 8; - pos_end_01 = strrchr (pos_args, '\01'); - if (pos_end_01) - pos_end_01[0] = '\0'; - - weechat_printf_tags (ptr_channel->buffer, - irc_protocol_tags (command, - (nick_is_me) ? - "irc_action,notify_private,no_highlight" : - "irc_action,notify_private"), - "%s%s%s %s%s", - weechat_prefix ("action"), - (nick_is_me) ? - IRC_COLOR_CHAT_NICK_SELF : IRC_COLOR_CHAT_NICK_OTHER, - nick, - IRC_COLOR_CHAT, - pos_args); - weechat_hook_signal_send ("irc_pv", - WEECHAT_HOOK_SIGNAL_STRING, - argv_eol[0]); - - if (pos_end_01) - pos_end_01[0] = '\01'; - } - } - else - { - /* unknown CTCP ? */ - pos_end_01 = strrchr (pos_args + 1, '\01'); - if ((pos_args[0] == '\01') - && pos_end_01 && (pos_end_01[1] == '\0')) - { - if (!irc_ignore_check (server, ptr_channel, remote_nick, host)) - { - pos_args++; - pos_end_01[0] = '\0'; - pos = strchr (pos_args, ' '); - if (pos) - { - pos[0] = '\0'; - pos_message = pos + 1; - while (pos_message[0] == ' ') - { - pos_message++; - } - if (!pos_message[0]) - pos_message = NULL; - } - else - pos_message = NULL; - - if (pos_message) - { - weechat_printf_tags (server->buffer, - irc_protocol_tags (command, "irc_ctcp"), - _("%sUnknown CTCP %s%s%s " - "received from %s%s%s: %s"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_CHANNEL, - pos_args, - IRC_COLOR_CHAT, - IRC_COLOR_CHAT_NICK, - nick, - IRC_COLOR_CHAT, - pos_message); - } - else - { - weechat_printf_tags (server->buffer, - irc_protocol_tags (command, "irc_ctcp"), - _("%sUnknown CTCP %s%s%s " - "received from %s%s%s"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_CHANNEL, - pos_args, - IRC_COLOR_CHAT, - IRC_COLOR_CHAT_NICK, - nick, - IRC_COLOR_CHAT); - } - if (pos_end_01) - pos_end_01[0] = '\01'; - if (pos) - pos[0] = ' '; - - weechat_hook_signal_send ("irc_ctcp", - WEECHAT_HOOK_SIGNAL_STRING, - argv_eol[0]); - } - } - else - { - /* private message */ - if (!irc_ignore_check (server, ptr_channel, remote_nick, host)) - { - if (!ptr_channel) - { - ptr_channel = irc_channel_new (server, - IRC_CHANNEL_TYPE_PRIVATE, - remote_nick, 0, 0); - if (!ptr_channel) - { - weechat_printf (server->buffer, - _("%s%s: cannot create new " - "private buffer \"%s\""), - weechat_prefix ("error"), - IRC_PLUGIN_NAME, remote_nick); - return WEECHAT_RC_ERROR; - } - } - irc_channel_set_topic (ptr_channel, address); - - weechat_printf_tags (ptr_channel->buffer, - irc_protocol_tags (command, - (nick_is_me) ? - "notify_private,no_highlight" : - "notify_private"), - "%s%s", - irc_nick_as_prefix (NULL, - nick, - (nick_is_me) ? - IRC_COLOR_CHAT_NICK_SELF : IRC_COLOR_CHAT_NICK_OTHER), - pos_args); - - weechat_hook_signal_send ("irc_pv", - WEECHAT_HOOK_SIGNAL_STRING, - argv_eol[0]); + weechat_printf (server->buffer, + _("%s%s: cannot create new " + "private buffer \"%s\""), + weechat_prefix ("error"), + IRC_PLUGIN_NAME, remote_nick); + return WEECHAT_RC_ERROR; } } + irc_channel_set_topic (ptr_channel, address); + + weechat_printf_tags (ptr_channel->buffer, + irc_protocol_tags (command, + (nick_is_me) ? + "notify_private,no_highlight" : + "notify_private"), + "%s%s", + irc_nick_as_prefix (NULL, + nick, + (nick_is_me) ? + IRC_COLOR_CHAT_NICK_SELF : irc_nick_color_for_pv (ptr_channel, nick)), + pos_args); + + weechat_hook_signal_send ("irc_pv", + WEECHAT_HOOK_SIGNAL_STRING, + argv_eol[0]); } } |