summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--doc/de/autogen/user/weechat_options.txt10
-rw-r--r--doc/en/autogen/user/weechat_options.txt10
-rw-r--r--doc/fr/autogen/user/weechat_options.txt10
-rw-r--r--doc/it/autogen/user/weechat_options.txt10
-rw-r--r--doc/ja/autogen/user/weechat_options.txt10
-rw-r--r--po/cs.po38
-rw-r--r--po/de.po38
-rw-r--r--po/es.po38
-rw-r--r--po/fr.po50
-rw-r--r--po/hu.po41
-rw-r--r--po/it.po38
-rw-r--r--po/ja.po38
-rw-r--r--po/pl.po38
-rw-r--r--po/pt_BR.po44
-rw-r--r--po/ru.po41
-rw-r--r--po/weechat.pot13
-rw-r--r--src/core/wee-config.c15
-rw-r--r--src/gui/gui-chat.c44
19 files changed, 347 insertions, 183 deletions
diff --git a/ChangeLog b/ChangeLog
index cd3e9c865..eec4ab81d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-dev, 2012-11-30
+v0.4.0-dev, 2012-12-01
Version 0.4.0 (under dev!)
--------------------------
+* core: add color support in options
+ weechat.look.prefix_{action|error|join|network|quit} (task #9555)
* core: fix display of combining chars (bug #37775)
* core: display default values for changed config options in output of /set
* core: stop cmake if gcrypt lib is not found (bug #37671)
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 0427f5eea..54a3071a6 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -609,7 +609,7 @@
** Werte: -1 .. 2147483647 (Standardwert: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** Beschreibung: `Präfix für Action-Nachrichten`
+** Beschreibung: `prefix for action messages, colors are allowed with format "${color}"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `" *"`)
@@ -649,22 +649,22 @@
** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** Beschreibung: `Präfix für Fehlermeldungen`
+** Beschreibung: `prefix for error messages, colors are allowed with format "${color}"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** Beschreibung: `Präfix für Join-Nachrichten`
+** Beschreibung: `prefix for join messages, colors are allowed with format "${color}"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** Beschreibung: `Präfix für Netzwerkmeldungen`
+** Beschreibung: `prefix for network messages, colors are allowed with format "${color}"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** Beschreibung: `Präfix für Quit-Nachrichten`
+** Beschreibung: `prefix for quit messages, colors are allowed with format "${color}"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"<--"`)
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index f1372feb5..a4b256e25 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -609,7 +609,7 @@
** values: -1 .. 2147483647 (default value: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** description: `prefix for action messages`
+** description: `prefix for action messages, colors are allowed with format "${color}"`
** type: string
** values: any string (default value: `" *"`)
@@ -649,22 +649,22 @@
** values: any string (default value: `"+"`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `prefix for error messages`
+** description: `prefix for error messages, colors are allowed with format "${color}"`
** type: string
** values: any string (default value: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** description: `prefix for join messages`
+** description: `prefix for join messages, colors are allowed with format "${color}"`
** type: string
** values: any string (default value: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** description: `prefix for network messages`
+** description: `prefix for network messages, colors are allowed with format "${color}"`
** type: string
** values: any string (default value: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** description: `prefix for quit messages`
+** description: `prefix for quit messages, colors are allowed with format "${color}"`
** type: string
** values: any string (default value: `"<--"`)
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 3efe8eeeb..ac58c0d2f 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -609,7 +609,7 @@
** valeurs: -1 .. 2147483647 (valeur par défaut: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** description: `préfixe pour les messages d'action`
+** description: `préfixe pour les messages d'action, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `" *"`)
@@ -649,22 +649,22 @@
** valeurs: toute chaîne (valeur par défaut: `"+"`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `préfixe pour les messages d'erreur`
+** description: `préfixe pour les messages d'erreur, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** description: `préfixe pour les messages d'arrivée`
+** description: `préfixe pour les messages d'arrivée, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** description: `préfixe pour les messages réseau`
+** description: `préfixe pour les messages réseau, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** description: `préfixe pour les messages de départ`
+** description: `préfixe pour les messages de départ, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"<--"`)
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 2235f3034..d81981210 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -609,7 +609,7 @@
** valori: -1 .. 2147483647 (valore predefinito: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** descrizione: `prefisso per i messaggi di azione`
+** descrizione: `prefix for action messages, colors are allowed with format "${color}"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `" *"`)
@@ -649,22 +649,22 @@
** valori: qualsiasi stringa (valore predefinito: `"+"`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** descrizione: `prefisso per i messaggi di errore`
+** descrizione: `prefix for error messages, colors are allowed with format "${color}"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** descrizione: `prefisso per i messaggi di entrata`
+** descrizione: `prefix for join messages, colors are allowed with format "${color}"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** descrizione: `prefisso per i messaggi di rete`
+** descrizione: `prefix for network messages, colors are allowed with format "${color}"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** descrizione: `prefisso per i messaggi di uscita`
+** descrizione: `prefix for quit messages, colors are allowed with format "${color}"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"<--"`)
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index bacb156ec..1c33d04d7 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -609,7 +609,7 @@
** 値: -1 .. 2147483647 (デフォルト値: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** 説明: `アクションメッセージのプレフィックス`
+** 説明: `prefix for action messages, colors are allowed with format "${color}"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `" *"`)
@@ -649,22 +649,22 @@
** 値: 未制約文字列 (デフォルト値: `"+"`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** 説明: `エラーメッセージのプレフィックス`
+** 説明: `prefix for error messages, colors are allowed with format "${color}"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** 説明: `join メッセージのプレフィックス`
+** 説明: `prefix for join messages, colors are allowed with format "${color}"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** 説明: `ネットワークメッセージのプレフィックス`
+** 説明: `prefix for network messages, colors are allowed with format "${color}"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** 説明: `quit メッセージのプレフィックス`
+** 説明: `prefix for quit messages, colors are allowed with format "${color}"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"<--"`)
diff --git a/po/cs.po b/po/cs.po
index 74513f579..d5f210306 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2655,20 +2655,21 @@ msgstr ""
"maximální počet řádků pro vložení bez dotazování uživatele (0 = vypnout tuto "
"vlastnost)"
-msgid "prefix for error messages"
-msgstr "prefix pro chybové zprávy"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "prefix pro zprávy sítě"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "prefix pro zprávy akcí"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "prefix pro zprávy připojení"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "prefix pro zprávy ukončení"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr "zarovnání prefixu (none, left, right (výchozí))"
@@ -9253,6 +9254,21 @@ msgstr ""
msgid "Constants"
msgstr ""
+#~ msgid "prefix for error messages"
+#~ msgstr "prefix pro chybové zprávy"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "prefix pro zprávy sítě"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "prefix pro zprávy akcí"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "prefix pro zprávy připojení"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "prefix pro zprávy ukončení"
+
#~ msgid ""
#~ "server: server name\n"
#~ " nick: nick (may be a mask)"
diff --git a/po/de.po b/po/de.po
index 1507d5fc7..a5ad44f5c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-11-04 15:41+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -3005,20 +3005,21 @@ msgstr ""
"maximale Anzahl an Zeilen die eingefügt werden dürfen, ohne dass der "
"Anwender gefragt wird (-1 = schaltet diese Funktion ab)"
-msgid "prefix for error messages"
-msgstr "Präfix für Fehlermeldungen"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "Präfix für Netzwerkmeldungen"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "Präfix für Action-Nachrichten"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "Präfix für Join-Nachrichten"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "Präfix für Quit-Nachrichten"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr ""
@@ -10074,6 +10075,21 @@ msgstr "Type"
msgid "Constants"
msgstr "Konstanten"
+#~ msgid "prefix for error messages"
+#~ msgstr "Präfix für Fehlermeldungen"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "Präfix für Netzwerkmeldungen"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "Präfix für Action-Nachrichten"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "Präfix für Join-Nachrichten"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "Präfix für Quit-Nachrichten"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/es.po b/po/es.po
index a98147fc9..83b297dc4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2820,20 +2820,21 @@ msgstr ""
"número máximo de líneas que el usuario puede pegar sin pedir confirmación "
"(-1 = deshabilitar esta función)"
-msgid "prefix for error messages"
-msgstr "prefijo para mensajes de error"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "prefijo para mensajes de la red"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "prefijo para mensajes de acción"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "prefijo para mensajes de unión"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "prefijo para mensajes de salida"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
# none, left, right are option names, keep in english
msgid "prefix alignment (none, left, right (default))"
@@ -9535,6 +9536,21 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Constantes"
+#~ msgid "prefix for error messages"
+#~ msgstr "prefijo para mensajes de error"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "prefijo para mensajes de la red"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "prefijo para mensajes de acción"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "prefijo para mensajes de unión"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "prefijo para mensajes de salida"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/fr.po b/po/fr.po
index ba006f46b..ee304dcd4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
-"PO-Revision-Date: 2012-11-27 22:28+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
+"PO-Revision-Date: 2012-12-01 12:58+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -2909,20 +2909,31 @@ msgstr ""
"nombre maximum de lignes pour la détection de collage sans demander à "
"l'utilisateur (-1 = désactiver cette fonctionnalité)"
-msgid "prefix for error messages"
-msgstr "préfixe pour les messages d'erreur"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
+"préfixe pour les messages d'erreur, les couleurs sont autorisées avec le "
+"format \"${couleur}\""
-msgid "prefix for network messages"
-msgstr "préfixe pour les messages réseau"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
+"préfixe pour les messages réseau, les couleurs sont autorisées avec le "
+"format \"${couleur}\""
-msgid "prefix for action messages"
-msgstr "préfixe pour les messages d'action"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
+"préfixe pour les messages d'action, les couleurs sont autorisées avec le "
+"format \"${couleur}\""
-msgid "prefix for join messages"
-msgstr "préfixe pour les messages d'arrivée"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
+"préfixe pour les messages d'arrivée, les couleurs sont autorisées avec le "
+"format \"${couleur}\""
-msgid "prefix for quit messages"
-msgstr "préfixe pour les messages de départ"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
+"préfixe pour les messages de départ, les couleurs sont autorisées avec le "
+"format \"${couleur}\""
msgid "prefix alignment (none, left, right (default))"
msgstr "alignement de préfixe (none, left, right (par défaut))"
@@ -9814,3 +9825,18 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
+
+#~ msgid "prefix for error messages"
+#~ msgstr "préfixe pour les messages d'erreur"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "préfixe pour les messages réseau"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "préfixe pour les messages d'action"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "préfixe pour les messages d'arrivée"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "préfixe pour les messages de départ"
diff --git a/po/hu.po b/po/hu.po
index 318189f2a..eb45a67c2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2290,24 +2290,21 @@ msgstr ""
"maximálisan beilleszthető sorok száma a felhasználó megkérdezése nélkül (0 = "
"szolgáltatás kikapcsolása)"
-#, fuzzy
-msgid "prefix for error messages"
-msgstr "hibakereső üzenetek megjelenítése"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
msgstr ""
-#, fuzzy
-msgid "prefix for action messages"
-msgstr "válasz ping üzenetre"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-#, fuzzy
-msgid "prefix for join messages"
-msgstr "új üzenetet tartalmazó ablak színe"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-#, fuzzy
-msgid "prefix for quit messages"
-msgstr "alapértelmezett kilépő üzenet"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
#, fuzzy
msgid "prefix alignment (none, left, right (default))"
@@ -8743,6 +8740,22 @@ msgid "Constants"
msgstr ""
#, fuzzy
+#~ msgid "prefix for error messages"
+#~ msgstr "hibakereső üzenetek megjelenítése"
+
+#, fuzzy
+#~ msgid "prefix for action messages"
+#~ msgstr "válasz ping üzenetre"
+
+#, fuzzy
+#~ msgid "prefix for join messages"
+#~ msgstr "új üzenetet tartalmazó ablak színe"
+
+#, fuzzy
+#~ msgid "prefix for quit messages"
+#~ msgstr "alapértelmezett kilépő üzenet"
+
+#, fuzzy
#~ msgid ""
#~ "server: server name\n"
#~ " nick: nick (may be a mask)"
diff --git a/po/it.po b/po/it.po
index ab9300970..164606d6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2804,20 +2804,21 @@ msgstr ""
"numero massimo di righe da incollare senza conferma dell'utente (-1 = "
"disabilita questa caratteristica)"
-msgid "prefix for error messages"
-msgstr "prefisso per i messaggi di errore"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "prefisso per i messaggi di rete"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "prefisso per i messaggi di azione"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "prefisso per i messaggi di entrata"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "prefisso per i messaggi di uscita"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr "allineamento prefisso (none, left, right (predefinito))"
@@ -9521,6 +9522,21 @@ msgstr "Tipo"
msgid "Constants"
msgstr "Costanti"
+#~ msgid "prefix for error messages"
+#~ msgstr "prefisso per i messaggi di errore"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "prefisso per i messaggi di rete"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "prefisso per i messaggi di azione"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "prefisso per i messaggi di entrata"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "prefisso per i messaggi di uscita"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/ja.po b/po/ja.po
index e7ca2154f..8d03a7d08 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -2755,20 +2755,21 @@ msgid ""
"max number of lines for paste without asking user (-1 = disable this feature)"
msgstr "ユーザへの確認無しにペーストする行数の最大値 (-1 = この機能を無効化)"
-msgid "prefix for error messages"
-msgstr "エラーメッセージのプレフィックス"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "ネットワークメッセージのプレフィックス"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "アクションメッセージのプレフィックス"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "join メッセージのプレフィックス"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "quit メッセージのプレフィックス"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr "プレフィックスの調節 (none、left、right (デフォルト))"
@@ -9388,6 +9389,21 @@ msgstr "タイプ"
msgid "Constants"
msgstr "定数"
+#~ msgid "prefix for error messages"
+#~ msgstr "エラーメッセージのプレフィックス"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "ネットワークメッセージのプレフィックス"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "アクションメッセージのプレフィックス"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "join メッセージのプレフィックス"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "quit メッセージのプレフィックス"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/pl.po b/po/pl.po
index 2111e5bc2..cad7a2839 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:42+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2808,20 +2808,21 @@ msgstr ""
"maksymalna ilość linii do wklejenia bez pytania użytkownika (-1 = wyłącza tę "
"opcję)"
-msgid "prefix for error messages"
-msgstr "przedrostek informacji o błędzie"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "przedrostek informacji sieciowych"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "przedrostek informacji o akcjach"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for join messages"
-msgstr "przedrostek informacji o wejściu na kanał"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "przedrostek informacji o wyjściu"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr "wyrównanie przedrostków (none, left, right (domyślne))"
@@ -9450,6 +9451,21 @@ msgstr "Typ"
msgid "Constants"
msgstr "Stałe"
+#~ msgid "prefix for error messages"
+#~ msgstr "przedrostek informacji o błędzie"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "przedrostek informacji sieciowych"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "przedrostek informacji o akcjach"
+
+#~ msgid "prefix for join messages"
+#~ msgstr "przedrostek informacji o wejściu na kanał"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "przedrostek informacji o wyjściu"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fb06d569f..92b159334 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:43+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2734,23 +2734,21 @@ msgstr ""
"número máximo de linhas para serem coladas sem perguntar ao usuário (0 = "
"desabilita essa característica)"
-msgid "prefix for error messages"
-msgstr "prefixo para mensagens de erro"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
-msgstr "prefixo para mensagens de rede"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for action messages"
-msgstr "prefixo para mensagens de ação"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-# Find a better translation to "join messages" or maybe just let "join"
-# untranslated?
-#, fuzzy
-msgid "prefix for join messages"
-msgstr "prefixo para mensagens de join"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for quit messages"
-msgstr "prefixo para mensagens de saída"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
msgid "prefix alignment (none, left, right (default))"
msgstr "alinhamento de prefixo (none, left, right (default))"
@@ -8886,6 +8884,24 @@ msgstr ""
msgid "Constants"
msgstr ""
+#~ msgid "prefix for error messages"
+#~ msgstr "prefixo para mensagens de erro"
+
+#~ msgid "prefix for network messages"
+#~ msgstr "prefixo para mensagens de rede"
+
+#~ msgid "prefix for action messages"
+#~ msgstr "prefixo para mensagens de ação"
+
+# Find a better translation to "join messages" or maybe just let "join"
+# untranslated?
+#, fuzzy
+#~ msgid "prefix for join messages"
+#~ msgstr "prefixo para mensagens de join"
+
+#~ msgid "prefix for quit messages"
+#~ msgstr "prefixo para mensagens de saída"
+
#~ msgid ""
#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
#~ "= window must be active, \"inactive\" = window must be inactive, "
diff --git a/po/ru.po b/po/ru.po
index 222732ab4..2a3a275e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.0-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+0100\n"
"PO-Revision-Date: 2012-09-29 11:43+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2317,24 +2317,21 @@ msgstr ""
"максимальное количество строк, вставляемых без подтверждения (0 = отключить "
"подтверждение)"
-#, fuzzy
-msgid "prefix for error messages"
-msgstr "выводить отладочные сообщения"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
+msgstr ""
-msgid "prefix for network messages"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
msgstr ""
-#, fuzzy
-msgid "prefix for action messages"
-msgstr "ответить на ping"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
+msgstr ""
-#, fuzzy
-msgid "prefix for join messages"
-msgstr "цвет текущего окна с сообщениями"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
+msgstr ""
-#, fuzzy
-msgid "prefix for quit messages"
-msgstr "сообщение о выходе по-умолчанию"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+msgstr ""
#, fuzzy
msgid "prefix alignment (none, left, right (default))"
@@ -8760,6 +8757,22 @@ msgid "Constants"
msgstr ""
#, fuzzy
+#~ msgid "prefix for error messages"
+#~ msgstr "выводить отладочные сообщения"
+
+#, fuzzy
+#~ msgid "prefix for action messages"
+#~ msgstr "ответить на ping"
+
+#, fuzzy
+#~ msgid "prefix for join messages"
+#~ msgstr "цвет текущего окна с сообщениями"
+
+#, fuzzy
+#~ msgid "prefix for quit messages"
+#~ msgstr "сообщение о выходе по-умолчанию"
+
+#, fuzzy
#~ msgid ""
#~ "server: server name\n"
#~ " nick: nick (may be a mask)"
diff --git a/po/weechat.pot b/po/weechat.pot
index 15b9dc160..6c54e2645 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: 2012-11-27 22:36+0100\n"
+"POT-Creation-Date: 2012-12-01 15:15+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"
@@ -2033,19 +2033,20 @@ msgid ""
"max number of lines for paste without asking user (-1 = disable this feature)"
msgstr ""
-msgid "prefix for error messages"
+msgid "prefix for error messages, colors are allowed with format \"${color}\""
msgstr ""
-msgid "prefix for network messages"
+msgid ""
+"prefix for network messages, colors are allowed with format \"${color}\""
msgstr ""
-msgid "prefix for action messages"
+msgid "prefix for action messages, colors are allowed with format \"${color}\""
msgstr ""
-msgid "prefix for join messages"
+msgid "prefix for join messages, colors are allowed with format \"${color}\""
msgstr ""
-msgid "prefix for quit messages"
+msgid "prefix for quit messages, colors are allowed with format \"${color}\""
msgstr ""
msgid "prefix alignment (none, left, right (default))"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 390a75ba6..a4fa0e5aa 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -2117,27 +2117,32 @@ config_weechat_init_options ()
config_look_prefix[GUI_CHAT_PREFIX_ERROR] = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_error", "string",
- N_("prefix for error messages"),
+ N_("prefix for error messages, colors are allowed with format "
+ "\"${color}\""),
NULL, 0, 0, "=!=", NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix[GUI_CHAT_PREFIX_NETWORK] = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_network", "string",
- N_("prefix for network messages"),
+ N_("prefix for network messages, colors are allowed with format "
+ "\"${color}\""),
NULL, 0, 0, "--", NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix[GUI_CHAT_PREFIX_ACTION] = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_action", "string",
- N_("prefix for action messages"),
+ N_("prefix for action messages, colors are allowed with format "
+ "\"${color}\""),
NULL, 0, 0, " *", NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix[GUI_CHAT_PREFIX_JOIN] = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_join", "string",
- N_("prefix for join messages"),
+ N_("prefix for join messages, colors are allowed with format "
+ "\"${color}\""),
NULL, 0, 0, "-->", NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix[GUI_CHAT_PREFIX_QUIT] = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_quit", "string",
- N_("prefix for quit messages"),
+ N_("prefix for quit messages, colors are allowed with format "
+ "\"${color}\""),
NULL, 0, 0, "<--", NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix_align = config_file_new_option (
weechat_config_file, ptr_section,
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 7770c6c91..a9cc190f0 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -91,7 +91,12 @@ gui_chat_init ()
void
gui_chat_prefix_build ()
{
- char prefix[128];
+ const char *ptr_prefix;
+ char prefix[512], *pos_color;
+ int prefix_color[GUI_CHAT_NUM_PREFIXES] =
+ { GUI_COLOR_CHAT_PREFIX_ERROR, GUI_COLOR_CHAT_PREFIX_NETWORK,
+ GUI_COLOR_CHAT_PREFIX_ACTION, GUI_COLOR_CHAT_PREFIX_JOIN,
+ GUI_COLOR_CHAT_PREFIX_QUIT };
int i;
for (i = 0; i < GUI_CHAT_NUM_PREFIXES; i++)
@@ -101,32 +106,19 @@ gui_chat_prefix_build ()
free (gui_chat_prefix[i]);
gui_chat_prefix[i] = NULL;
}
- }
- snprintf (prefix, sizeof (prefix), "%s%s\t",
- GUI_COLOR(GUI_COLOR_CHAT_PREFIX_ERROR),
- CONFIG_STRING(config_look_prefix[GUI_CHAT_PREFIX_ERROR]));
- gui_chat_prefix[GUI_CHAT_PREFIX_ERROR] = strdup (prefix);
-
- snprintf (prefix, sizeof (prefix), "%s%s\t",
- GUI_COLOR(GUI_COLOR_CHAT_PREFIX_NETWORK),
- CONFIG_STRING(config_look_prefix[GUI_CHAT_PREFIX_NETWORK]));
- gui_chat_prefix[GUI_CHAT_PREFIX_NETWORK] = strdup (prefix);
-
- snprintf (prefix, sizeof (prefix), "%s%s\t",
- GUI_COLOR(GUI_COLOR_CHAT_PREFIX_ACTION),
- CONFIG_STRING(config_look_prefix[GUI_CHAT_PREFIX_ACTION]));
- gui_chat_prefix[GUI_CHAT_PREFIX_ACTION] = strdup (prefix);
-
- snprintf (prefix, sizeof (prefix), "%s%s\t",
- GUI_COLOR(GUI_COLOR_CHAT_PREFIX_JOIN),
- CONFIG_STRING(config_look_prefix[GUI_CHAT_PREFIX_JOIN]));
- gui_chat_prefix[GUI_CHAT_PREFIX_JOIN] = strdup (prefix);
-
- snprintf (prefix, sizeof (prefix), "%s%s\t",
- GUI_COLOR(GUI_COLOR_CHAT_PREFIX_QUIT),
- CONFIG_STRING(config_look_prefix[GUI_CHAT_PREFIX_QUIT]));
- gui_chat_prefix[GUI_CHAT_PREFIX_QUIT] = strdup (prefix);
+ ptr_prefix = CONFIG_STRING(config_look_prefix[i]);
+ pos_color = strstr (ptr_prefix, "${");
+
+ snprintf(prefix, sizeof (prefix), "%s%s\t",
+ (!pos_color || (pos_color > ptr_prefix)) ? GUI_COLOR(prefix_color[i]) : "",
+ ptr_prefix);
+
+ if (pos_color)
+ gui_chat_prefix[i] = gui_color_string_replace_colors (prefix);
+ else
+ gui_chat_prefix[i] = strdup (prefix);
+ }
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 03:37:20 +0000