From b4ccd82a9dc982dcbdac13f3506f8db89f15a725 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 22 Feb 2011 19:33:44 +0100 Subject: [PATCH] Replace char "/" by ":" to specify background in nick colors --- ChangeLog | 2 +- doc/de/autogen/user/weechat_options.txt | 2 +- doc/en/autogen/user/weechat_options.txt | 2 +- doc/fr/autogen/user/weechat_options.txt | 2 +- doc/it/autogen/user/weechat_options.txt | 2 +- po/cs.po | 5 +++-- po/de.po | 11 ++++++----- po/es.po | 5 +++-- po/fr.po | 17 +++++++++++------ po/hu.po | 5 +++-- po/it.po | 9 +++++---- po/pl.po | 5 +++-- po/pt_BR.po | 5 +++-- po/ru.po | 5 +++-- po/weechat.pot | 5 +++-- src/core/wee-config.c | 4 +++- src/gui/gui-color.c | 2 +- 17 files changed, 52 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index d12d5a45c..04e072626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,7 +24,7 @@ Version 0.3.5 (under dev!) * core: add attributes for colors ("*": bold, "%": reverse, "_": underline) * core: dynamically allocate color pairs (extended colors can be used without being added with command "/color") -* core: allow background for nick colors (using "/") +* core: allow background for nick colors (using ":") * irc: fix crash when completing /part command on a non-irc buffer (bug #32402) * irc: add many missing commands for target buffer (options irc.msgbuffer.xxx) (bug #32216) diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index a32fcea37..4231b2e6e 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -49,7 +49,7 @@ ** Werte: 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 (Standardwert: `lightcyan`) * *weechat.color.chat_nick_colors* -** Beschreibung: `Textfarbe für Nicks (durch Kommata getrennte Liste von Farben. Eine Hintergrundfarbe kann durch das folgende Format genutzt werden: "fg/bg". Zum Beispiel: "blau/rot")` +** Beschreibung: `Textfarbe für Nicks (durch Kommata getrennte Liste von Farben. Eine Hintergrundfarbe kann durch das folgende Format genutzt werden: "fg:bg". Zum Beispiel: "lightred:blue")` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`) diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index ad4e6877f..ce3dc8742 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -49,7 +49,7 @@ ** 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: `lightcyan`) * *weechat.color.chat_nick_colors* -** description: `text color for nicks (comma separated list of colors, background is allowed with format: "fg/bg", for example: "blue/red")` +** description: `text color for nicks (comma separated list of colors, background is allowed with format: "fg:bg", for example: "lightred:blue")` ** type: string ** values: any string (default value: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`) diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 156663d67..1ff0c68d1 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -49,7 +49,7 @@ ** 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: `lightcyan`) * *weechat.color.chat_nick_colors* -** description: `couleur du texte pour les pseudos (liste de couleurs séparées par une virgule, un fond est autorisé avec le format: "couleur/fond", par exemple: "blue/red")` +** description: `couleur du texte pour les pseudos (liste de couleurs séparées par une virgule, un fond est autorisé avec le format: "couleur:fond", par exemple: "lightred:blue")` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`) diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index fbdaf688c..ed906e597 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -49,7 +49,7 @@ ** valori: 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 (valore predefinito: `lightcyan`) * *weechat.color.chat_nick_colors* -** descrizione: `colore del testo per i nick (elenco separato da virgole di colori, quello di sfondo è consentito con il formato "fg/bg", ad esempio: "blue/red")` +** descrizione: `colore del testo per i nick (elenco separato da virgole di colori, quello di sfondo è consentito con il formato "fg:bg", ad esempio: "lightred:blue")` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`) diff --git a/po/cs.po b/po/cs.po index 281830179..59a0f498b 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2238,10 +2238,11 @@ msgstr "barva textu pro jméno kanálu" msgid "text color for nicks in chat window" msgstr "barva textu přezdívky v okně rozhovoru" +#. TRANSLATORS: please do not translate "lightred:blue" #, fuzzy msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "barva textu přezdívky v okně rozhovoru" msgid "text color for local nick in chat window" diff --git a/po/de.po b/po/de.po index 4d6ad37aa..f55a50ee9 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-02-21 19:06+0100\n" -"PO-Revision-Date: 2011-02-17 15:02+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" +"PO-Revision-Date: 2011-02-22 19:26+0100\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" "Language: \n" @@ -2410,13 +2410,14 @@ msgstr "Farbe der Channel-Namens" msgid "text color for nicks in chat window" msgstr "Farbe für Nicks im Chat-Fenster" +#. TRANSLATORS: please do not translate "lightred:blue" msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "" "Textfarbe für Nicks (durch Kommata getrennte Liste von Farben. Eine " -"Hintergrundfarbe kann durch das folgende Format genutzt werden: \"fg/bg\". " -"Zum Beispiel: \"blau/rot\")" +"Hintergrundfarbe kann durch das folgende Format genutzt werden: \"fg:bg\". " +"Zum Beispiel: \"lightred:blue\")" msgid "text color for local nick in chat window" msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster." diff --git a/po/es.po b/po/es.po index e2d9be9ac..cae23be73 100644 --- a/po/es.po +++ b/po/es.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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2297,10 +2297,11 @@ msgstr "color para los nombres de los canales" msgid "text color for nicks in chat window" msgstr "color para los apodos en la ventana de conversación" +#. TRANSLATORS: please do not translate "lightred:blue" #, fuzzy msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "color para los apodos (lista de colores separadas por comas)" msgid "text color for local nick in chat window" diff --git a/po/fr.po b/po/fr.po index e75ba4675..d812f0316 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-02-21 19:06+0100\n" -"PO-Revision-Date: 2011-02-21 19:07+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" +"PO-Revision-Date: 2011-02-22 19:26+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -1797,7 +1797,11 @@ msgid "" " || merge [all] || page_up|page_down || refresh || scroll|scroll_up|" "scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" "scroll_next_highlight || zoom" -msgstr "list || -1|+1|b#|up|down|left|right || splith|splitv [] || resize [+/-] || merge [all] || page_up|page_down || refresh || scroll|scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|scroll_next_highlight || zoom" +msgstr "" +"list || -1|+1|b#|up|down|left|right || splith|splitv [] || resize [+/-]" +" || merge [all] || page_up|page_down || refresh || scroll|scroll_up|" +"scroll_down|scroll_top|scroll_bottom|scroll_previous_highlight|" +"scroll_next_highlight || zoom" msgid "" " list: list opened windows (without argument, this list is " @@ -2349,13 +2353,14 @@ msgstr "couleur du texte pour le nom des canaux" msgid "text color for nicks in chat window" msgstr "couleur du texte pour les pseudos dans la fenêtre de discussion" +#. TRANSLATORS: please do not translate "lightred:blue" msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "" "couleur du texte pour les pseudos (liste de couleurs séparées par une " -"virgule, un fond est autorisé avec le format: \"couleur/fond\", par exemple: " -"\"blue/red\")" +"virgule, un fond est autorisé avec le format: \"couleur:fond\", par exemple: " +"\"lightred:blue\")" msgid "text color for local nick in chat window" msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion" diff --git a/po/hu.po b/po/hu.po index 357ffb3bb..14a05d6f6 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -2016,10 +2016,11 @@ msgstr "szobanevek színe az eseményekben" msgid "text color for nicks in chat window" msgstr "idő színe a beszédablakban" +#. TRANSLATORS: please do not translate "lightred:blue" #, fuzzy msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "idő színe a beszédablakban" #, fuzzy diff --git a/po/it.po b/po/it.po index f30f0b47a..4619260e9 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-02-21 19:06+0100\n" -"PO-Revision-Date: 2011-02-17 15:03+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" +"PO-Revision-Date: 2011-02-22 19:26+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" "Language: Italian\n" @@ -2295,12 +2295,13 @@ msgstr "colore del testo per i nomi dei canali" msgid "text color for nicks in chat window" msgstr "colore del testo per i nick nella finestra di chat" +#. TRANSLATORS: please do not translate "lightred:blue" msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "" "colore del testo per i nick (elenco separato da virgole di colori, quello di " -"sfondo è consentito con il formato \"fg/bg\", ad esempio: \"blue/red\")" +"sfondo è consentito con il formato \"fg:bg\", ad esempio: \"lightred:blue\")" msgid "text color for local nick in chat window" msgstr "colore del testo per il nick locale nella finestra di chat" diff --git a/po/pl.po b/po/pl.po index 98b1758ea..f1fbc7e01 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -2300,10 +2300,11 @@ msgstr "kolor nazw kanałów" msgid "text color for nicks in chat window" msgstr "kolor nicków w oknie rozmowy" +#. TRANSLATORS: please do not translate "lightred:blue" #, fuzzy msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "kolor tenksu nickow (oddzielona przecinkami lista kolorów)" msgid "text color for local nick in chat window" diff --git a/po/pt_BR.po b/po/pt_BR.po index 615604102..e079823b5 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -2260,9 +2260,10 @@ msgstr "" msgid "text color for nicks in chat window" msgstr "" +#. TRANSLATORS: please do not translate "lightred:blue" msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "" msgid "text color for local nick in chat window" diff --git a/po/ru.po b/po/ru.po index b1aa9b7d9..41ed7f8bc 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -2034,10 +2034,11 @@ msgstr "цвет имён при действиях" msgid "text color for nicks in chat window" msgstr "цвет времени в окне чата" +#. TRANSLATORS: please do not translate "lightred:blue" #, fuzzy msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "цвет времени в окне чата" #, fuzzy diff --git a/po/weechat.pot b/po/weechat.pot index bcf93cc31..ee2b187eb 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-02-21 19:06+0100\n" +"POT-Creation-Date: 2011-02-22 19:27+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1741,9 +1741,10 @@ msgstr "" msgid "text color for nicks in chat window" msgstr "" +#. TRANSLATORS: please do not translate "lightred:blue" msgid "" "text color for nicks (comma separated list of colors, background is allowed " -"with format: \"fg/bg\", for example: \"blue/red\")" +"with format: \"fg:bg\", for example: \"lightred:blue\")" msgstr "" msgid "text color for local nick in chat window" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index f71d90cba..b81fa8357 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -1889,8 +1889,10 @@ config_weechat_init_options () config_color_chat_nick_colors = config_file_new_option ( weechat_config_file, ptr_section, "chat_nick_colors", "string", + /* TRANSLATORS: please do not translate "lightred:blue" */ N_("text color for nicks (comma separated list of colors, background " - "is allowed with format: \"fg/bg\", for example: \"blue/red\")"), + "is allowed with format: \"fg:bg\", for example: " + "\"lightred:blue\")"), NULL, 0, 0, "cyan,magenta,green,brown,lightblue,default,lightcyan," "lightmagenta,lightgreen,blue", NULL, 0, NULL, NULL, &config_change_nick_colors, NULL, NULL, NULL); diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c index 7e5aa4f56..66d3b4f33 100644 --- a/src/gui/gui-color.c +++ b/src/gui/gui-color.c @@ -264,7 +264,7 @@ gui_color_get_custom (const char *color_name) pos_delim = strchr (ptr_color_name, ','); if (!pos_delim) - pos_delim = strchr (ptr_color_name, '/'); + pos_delim = strchr (ptr_color_name, ':'); if (pos_delim) { if (pos_delim == ptr_color_name)