diff --git a/ChangeLog b/ChangeLog index ef23cdb97..e8a0ff660 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ Version 0.3.5 (under dev!) (plugins: irc, relay, xfer, scripts) * aspell: add section "option" in aspell.conf for speller options (task #11083) * aspell: fix spellers used after switch of window (bug #32811) +* irc: add new options irc.color.topic_old and irc.color.topic_new * irc: add option "ssl_priorities" in servers (task #10106, debian #624055) * irc: add modifier "irc_in2_xxx" (called after charset decoding) * irc: fix memory leak when copying or renaming server diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 6c047c4ea..8948cd26f 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -58,6 +58,16 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`) +* *irc.color.topic_new* +** Beschreibung: `color for new channel topic (when topic is changed)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `white`) + +* *irc.color.topic_old* +** Beschreibung: `color for old channel topic (when topic is changed)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`) + * *irc.look.buffer_switch_autojoin* ** Beschreibung: `wechselt automatisch zum Channel-Buffer falls dieser automatisch betreten wurde (mittels der Server-Option "autojoin")` ** Typ: boolesch diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index a81e47b2c..290fbeee5 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -58,6 +58,16 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `default`) +* *irc.color.topic_new* +** description: `color for new channel topic (when topic is changed)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `white`) + +* *irc.color.topic_old* +** description: `color for old channel topic (when topic is changed)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `darkgray`) + * *irc.look.buffer_switch_autojoin* ** description: `auto switch to channel buffer when it is auto joined (with server option "autojoin")` ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index d50f72b0a..5cc6dfd98 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -58,6 +58,16 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `default`) +* *irc.color.topic_new* +** description: `couleur pour le nouveau titre du canal (lorsque le titre est changé)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `white`) + +* *irc.color.topic_old* +** description: `couleur pour l'ancien titre du canal (lorsque le titre est changé)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `darkgray`) + * *irc.look.buffer_switch_autojoin* ** description: `basculer automatiquement vers le tampon du canal lorsqu'il est automatiquement rejoint (avec l'option du serveur "autojoin")` ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index b6b3869ba..3a3cf35e2 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -58,6 +58,16 @@ ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `default`) +* *irc.color.topic_new* +** descrizione: `color for new channel topic (when topic is changed)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `white`) + +* *irc.color.topic_old* +** descrizione: `color for old channel topic (when topic is changed)` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`) + * *irc.look.buffer_switch_autojoin* ** descrizione: `passa automaticamente al buffer del canale con l'ingresso automatico abilitato (con l'opzione del server "autojoin")` ** tipo: bool diff --git a/po/cs.po b/po/cs.po index bf7138c21..8e3f4c397 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: 2011-04-10 17:32+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -5251,6 +5251,14 @@ msgstr "barva ukazatele lagu, pokud bylo od serveru obdrženo pong" msgid "color for reason in part/quit messages" msgstr "barva textu důvodu ve zprávách odchodu/ukončení" +#, fuzzy +msgid "color for old channel topic (when topic is changed)" +msgstr "zobrazit staré téma rozhovoru, když se téma změní" + +#, fuzzy +msgid "color for new channel topic (when topic is changed)" +msgstr "zobrazit staré téma rozhovoru, když se téma změní" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5624,16 +5632,16 @@ msgstr "%s%s%s%s%s%s%s%s%s%s skončil" msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: obdržen \"%s\" příkaz bez kanálu" -#, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +#, fuzzy, c-format +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "%s%s%s%s změnil téma pro %s%s%s z \"%s%s\" na \"%s%s\"" -#, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +#, fuzzy, c-format +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\"" #, fuzzy, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "%s%s%s%s změnil téma pro %s%s%s na \"%s%s\"" #, c-format diff --git a/po/de.po b/po/de.po index 37bae2f10..43e1e16f0 100644 --- a/po/de.po +++ b/po/de.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 12:34+0200\n" -"PO-Revision-Date: 2011-04-26 19:39+0100\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" +"PO-Revision-Date: 2011-04-28 14:22+0200\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" "Language: \n" @@ -5532,6 +5532,14 @@ msgstr "" "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden " "soll" +#, fuzzy +msgid "color for old channel topic (when topic is changed)" +msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde" + +#, fuzzy +msgid "color for new channel topic (when topic is changed)" +msgstr "Zeige den alten Topic, falls der Channel-Topic geändert wurde" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5907,19 +5915,19 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: Der Befehl \"%s\" wurde ohne Channel empfangen" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "" -"%s%s%s%s hat das Topic für den Channel %s%s%s von \"%s%s\" auf \"%s%s\" " +"%s%s%s%s hat das Topic für den Channel %s%s%s von \"%s%s%s\" auf \"%s%s%s\" " "geändert." #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" -msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s\" gesetzt." +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgstr "%s%s%s%s hat das Topic für den Channel %s%s%s auf \"%s%s%s\" gesetzt." #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "" -"%s%s%s%s hat das Thema für %s%s%s zurückgesetzt (altes Thema: \"%s%s\")" +"%s%s%s%s hat das Thema für %s%s%s zurückgesetzt (altes Thema: \"%s%s%s\")" #, c-format msgid "%s%s%s%s has unset topic for %s%s%s" @@ -7907,32 +7915,3 @@ msgstr "Hashtable (Ausgabe)" msgid "Pointer" msgstr "Pointer" - -#~ msgid "color for prefix of nick which is op/admin/owner on channel" -#~ msgstr "Textfarbe für den Nick-Präfix von op/admin/owner in einem Channel" - -#~ msgid "color for prefix of nick which is halfop on channel" -#~ msgstr "Textfarbe für den Nick-Präfix des halfop in einem Channel" - -#~ msgid "color for prefix of nick which has voice on channel" -#~ msgstr "" -#~ "Textfarbe für den Nick-Präfix für einen User mit Voice Rechten in einem " -#~ "Channel" - -#~ msgid "color for prefix of nick which is user on channel" -#~ msgstr "Textfarbe für den Nick-Präfix eines Users in einem Channel" - -#, fuzzy -#~ msgid "comma separated list of tags that will force highlight" -#~ msgstr "" -#~ "Durch Kommata getrennte Liste der Wörterbücher, die in diesem Buffer " -#~ "genutzt werden" - -#~ msgid "%s%s: channel \"%s\" not found for \"%s\" command" -#~ msgstr "%s%s: Channel \"%s\" für den \"%s\"-Befehl nicht gefunden" - -#~ msgid "hook type: command, timer, .. (optional)" -#~ msgstr "hook Type: command, timer, .. (optional)" - -#~ msgid "a color name" -#~ msgstr "ein Farbname" diff --git a/po/es.po b/po/es.po index 477cedcda..6d90e319d 100644 --- a/po/es.po +++ b/po/es.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" -"PO-Revision-Date: 2011-04-10 17:31+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" +"PO-Revision-Date: 2011-04-28 14:24+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: Spanish\n" @@ -5384,6 +5384,14 @@ msgstr "color del indicador de lag, cuando se recibió el pong del servidor" msgid "color for reason in part/quit messages" msgstr "color para el mensaje de salida/abandono" +#, fuzzy +msgid "color for old channel topic (when topic is changed)" +msgstr "mostrar el tema anterior cuando se cambia el tema del canal" + +#, fuzzy +msgid "color for new channel topic (when topic is changed)" +msgstr "mostrar el tema anterior cuando se cambia el tema del canal" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5756,16 +5764,16 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: comando \"%s\" recibido sin un canal" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" -msgstr "%s%s%s%s ha cambiado el tema para %s%s%s de \"%s%s\" a \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" +msgstr "%s%s%s%s ha cambiado el tema para %s%s%s de \"%s%s%s\" a \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" -msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgstr "%s%s%s%s ha cambiado el tema para %s%s%s a \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" -msgstr "%s%s%s%s ha borrado el tema para %s%s%s (tema anterior: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" +msgstr "%s%s%s%s ha borrado el tema para %s%s%s (tema anterior: \"%s%s%s\")" #, c-format msgid "%s%s%s%s has unset topic for %s%s%s" diff --git a/po/fr.po b/po/fr.po index a137440cd..e3b366afe 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" -"PO-Revision-Date: 2011-04-28 11:56+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" +"PO-Revision-Date: 2011-04-28 14:20+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5425,6 +5425,12 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "couleur pour la raison dans les messages part/quit" +msgid "color for old channel topic (when topic is changed)" +msgstr "couleur pour l'ancien titre du canal (lorsque le titre est changé)" + +msgid "color for new channel topic (when topic is changed)" +msgstr "couleur pour le nouveau titre du canal (lorsque le titre est changé)" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5794,16 +5800,16 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: commande \"%s\" reçue sans canal" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" -msgstr "%s%s%s%s a changé le titre pour %s%s%s de \"%s%s\" en \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" +msgstr "%s%s%s%s a changé le titre pour %s%s%s de \"%s%s%s\" en \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" -msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgstr "%s%s%s%s a changé le titre pour %s%s%s en \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" -msgstr "%s%s%s%s a retiré le titre pour %s%s%s (ancien titre: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" +msgstr "%s%s%s%s a retiré le titre pour %s%s%s (ancien titre: \"%s%s%s\")" #, c-format msgid "%s%s%s%s has unset topic for %s%s%s" diff --git a/po/hu.po b/po/hu.po index 7ac25e196..9b2932543 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: 2011-04-10 11:21+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4921,6 +4921,12 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "alapértelmezett kilépő üzenet" +msgid "color for old channel topic (when topic is changed)" +msgstr "" + +msgid "color for new channel topic (when topic is changed)" +msgstr "" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5301,15 +5307,15 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s \"%s\" parancs érkezett szoba megadása nélkül\n" #, fuzzy, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:" #, fuzzy, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:" #, fuzzy, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:" #, fuzzy, c-format diff --git a/po/it.po b/po/it.po index 48e197832..840aadee5 100644 --- a/po/it.po +++ b/po/it.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" -"PO-Revision-Date: 2011-04-10 17:33+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" +"PO-Revision-Date: 2011-04-28 14:24+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" "Language: Italian\n" @@ -5361,6 +5361,14 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "colore per il motivo nei messaggi di uscita/abbandono" +#, fuzzy +msgid "color for old channel topic (when topic is changed)" +msgstr "visualizza l'argomento del canale precedente quando viene cambiato" + +#, fuzzy +msgid "color for new channel topic (when topic is changed)" +msgstr "visualizza l'argomento del canale precedente quando viene cambiato" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5732,17 +5740,17 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: comando \"%s\" ricevuto senza alcun canale" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" -msgstr "%s%s%s%s ha cambiato l'argomento per %s%s%s da \"%s%s\" a \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" +msgstr "%s%s%s%s ha cambiato l'argomento per %s%s%s da \"%s%s%s\" a \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" -msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" +msgstr "%s%s%s%s ha cambiato argomento per %s%s%s in \"%s%s%s\"" #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "" -"%s%s%s%s ha rimosso l'argomento per %s%s%s (argomento precedente: \"%s%s\")" +"%s%s%s%s ha rimosso l'argomento per %s%s%s (argomento precedente: \"%s%s%s\")" #, c-format msgid "%s%s%s%s has unset topic for %s%s%s" diff --git a/po/pl.po b/po/pl.po index d254f6722..f0a08b42a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: 2011-04-10 17:32+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -5358,6 +5358,14 @@ msgstr "kolor wskaźnika opóźnienia, kiedy otrzymamy pong od serwera" msgid "color for reason in part/quit messages" msgstr "kolor tekstu powodu opuszczenia kanału/wyjścia z IRC" +#, fuzzy +msgid "color for old channel topic (when topic is changed)" +msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału" + +#, fuzzy +msgid "color for new channel topic (when topic is changed)" +msgstr "wyświetl stary temat, kiedy zmieniany jest temat kanału" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5727,16 +5735,16 @@ msgstr "%s%s%s%s%s%s%s%s%s%s wyszedł z IRC" msgid "%s%s: \"%s\" command received without channel" msgstr "%s%s: \"%s\" komenda otrzymana bez kanału" -#, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +#, fuzzy, c-format +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "%s%s%s%s zmienił temat %s%s%s z \"%s%s\" na \"%s%s\"" -#, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +#, fuzzy, c-format +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "%s%s%s%s zmienił temat %s%s%s na \"%s%s\"" -#, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +#, fuzzy, c-format +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "%s%s%s%s skasował temat dla %s%s%s (stary temat: \"%s%s\")" #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 937b52a93..52cd829f1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: 2011-04-10 11:22+0200\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -4742,6 +4742,12 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "" +msgid "color for old channel topic (when topic is changed)" +msgstr "" + +msgid "color for new channel topic (when topic is changed)" +msgstr "" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5087,15 +5093,15 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "" #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "" #, c-format diff --git a/po/ru.po b/po/ru.po index 56b619d3b..e816906bf 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: 2011-04-10 17:33+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4928,6 +4928,12 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "сообщение о выходе по-умолчанию" +msgid "color for old channel topic (when topic is changed)" +msgstr "" + +msgid "color for new channel topic (when topic is changed)" +msgstr "" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -5315,15 +5321,15 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "%s \"%s\" команда получена без канала\n" #, fuzzy, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "%s%s%s сменил тему %s%s%s на:" #, fuzzy, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "%s%s%s сменил тему %s%s%s на:" #, fuzzy, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "%s%s%s сменил тему %s%s%s на:" #, fuzzy, c-format diff --git a/po/weechat.pot b/po/weechat.pot index f8fbb60ca..8563dbe8e 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: 2011-04-28 11:55+0200\n" +"POT-Creation-Date: 2011-04-28 14:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4202,6 +4202,12 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "" +msgid "color for old channel topic (when topic is changed)" +msgstr "" + +msgid "color for new channel topic (when topic is changed)" +msgstr "" + msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" @@ -4547,15 +4553,15 @@ msgid "%s%s: \"%s\" command received without channel" msgstr "" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s\" to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s from \"%s%s%s\" to \"%s%s%s\"" msgstr "" #, c-format -msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s\"" +msgid "%s%s%s%s has changed topic for %s%s%s to \"%s%s%s\"" msgstr "" #, c-format -msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s\")" +msgid "%s%s%s%s has unset topic for %s%s%s (old topic: \"%s%s%s\")" msgstr "" #, c-format diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index 4cfe6b4c0..ad9b4c305 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -57,6 +57,9 @@ /* macros for WeeChat core and IRC colors */ +#define IRC_COLOR_BAR_FG weechat_color("bar_fg") +#define IRC_COLOR_BAR_BG weechat_color("bar_bg") +#define IRC_COLOR_BAR_DELIM weechat_color("bar_delim") #define IRC_COLOR_CHAT weechat_color("chat") #define IRC_COLOR_CHAT_CHANNEL weechat_color("chat_channel") #define IRC_COLOR_CHAT_DELIMITERS weechat_color("chat_delimiters") @@ -72,16 +75,15 @@ #define IRC_COLOR_NICK_PREFIX_USER weechat_color(weechat_config_string(irc_config_color_nick_prefix_user)) #define IRC_COLOR_NICK_PREFIX weechat_color(weechat_config_string(irc_config_color_nick_prefix)) #define IRC_COLOR_NICK_SUFFIX weechat_color(weechat_config_string(irc_config_color_nick_suffix)) -#define IRC_COLOR_BAR_FG weechat_color("bar_fg") -#define IRC_COLOR_BAR_BG weechat_color("bar_bg") -#define IRC_COLOR_BAR_DELIM weechat_color("bar_delim") +#define IRC_COLOR_NOTICE weechat_color(weechat_config_string(irc_config_color_notice)) #define IRC_COLOR_STATUS_NUMBER weechat_color("status_number") #define IRC_COLOR_STATUS_NAME weechat_color("status_name") #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_TOPIC_OLD weechat_color(weechat_config_string(irc_config_color_topic_old)) +#define IRC_COLOR_TOPIC_NEW weechat_color(weechat_config_string(irc_config_color_topic_new)) #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)) #define IRC_COLOR_ITEM_CHANNEL_MODES weechat_color(weechat_config_string(irc_config_color_item_channel_modes)) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index d368cf47a..7a8dc0616 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -109,6 +109,8 @@ struct t_config_option *irc_config_color_item_channel_modes; struct t_config_option *irc_config_color_item_lag_counting; struct t_config_option *irc_config_color_item_lag_finished; struct t_config_option *irc_config_color_reason_quit; +struct t_config_option *irc_config_color_topic_old; +struct t_config_option *irc_config_color_topic_new; /* IRC config, network section */ @@ -2299,6 +2301,18 @@ irc_config_init () N_("color for reason in part/quit messages"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_color_topic_old = weechat_config_new_option ( + irc_config_file, ptr_section, + "topic_old", "color", + N_("color for old channel topic (when topic is changed)"), + NULL, -1, 0, "darkgray", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); + irc_config_color_topic_new = weechat_config_new_option ( + irc_config_file, ptr_section, + "topic_new", "color", + N_("color for new channel topic (when topic is changed)"), + NULL, -1, 0, "white", 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 912f1de6b..7b072f08e 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -132,6 +132,8 @@ extern struct t_config_option *irc_config_color_item_channel_modes; extern struct t_config_option *irc_config_color_item_lag_counting; extern struct t_config_option *irc_config_color_item_lag_finished; extern struct t_config_option *irc_config_color_reason_quit; +extern struct t_config_option *irc_config_color_topic_old; +extern struct t_config_option *irc_config_color_topic_new; 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 5bc259e46..28eefd9fa 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1696,7 +1696,7 @@ IRC_PROTOCOL_CALLBACK(topic) ptr_buffer), irc_protocol_tags (command, NULL, NULL), _("%s%s%s%s has changed topic for %s%s%s " - "from \"%s%s\" to \"%s%s\""), + "from \"%s%s%s\" to \"%s%s%s\""), weechat_prefix ("network"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, @@ -1704,8 +1704,10 @@ IRC_PROTOCOL_CALLBACK(topic) IRC_COLOR_CHAT_CHANNEL, argv[2], IRC_COLOR_CHAT, + IRC_COLOR_TOPIC_OLD, (old_topic_color) ? old_topic_color : ptr_channel->topic, IRC_COLOR_CHAT, + IRC_COLOR_TOPIC_NEW, (topic_color) ? topic_color : pos_topic, IRC_COLOR_CHAT); if (old_topic_color) @@ -1717,8 +1719,8 @@ IRC_PROTOCOL_CALLBACK(topic) command, NULL, ptr_buffer), irc_protocol_tags (command, NULL, NULL), - _("%s%s%s%s has changed topic for %s%s%s to " - "\"%s%s\""), + _("%s%s%s%s has changed topic for %s%s%s " + "to \"%s%s%s\""), weechat_prefix ("network"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, @@ -1726,6 +1728,7 @@ IRC_PROTOCOL_CALLBACK(topic) IRC_COLOR_CHAT_CHANNEL, argv[2], IRC_COLOR_CHAT, + IRC_COLOR_TOPIC_NEW, (topic_color) ? topic_color : pos_topic, IRC_COLOR_CHAT); } @@ -1744,7 +1747,7 @@ IRC_PROTOCOL_CALLBACK(topic) ptr_buffer), irc_protocol_tags (command, NULL, NULL), _("%s%s%s%s has unset topic for %s%s%s " - "(old topic: \"%s%s\")"), + "(old topic: \"%s%s%s\")"), weechat_prefix ("network"), IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), nick, @@ -1752,6 +1755,7 @@ IRC_PROTOCOL_CALLBACK(topic) IRC_COLOR_CHAT_CHANNEL, argv[2], IRC_COLOR_CHAT, + IRC_COLOR_TOPIC_OLD, (old_topic_color) ? old_topic_color : ptr_channel->topic, IRC_COLOR_CHAT); if (old_topic_color)