summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--NEWS27
-rw-r--r--doc/de/autogen/user/weechat_options.txt12
-rw-r--r--doc/en/autogen/user/weechat_options.txt12
-rw-r--r--doc/fr/autogen/user/weechat_options.txt12
-rw-r--r--doc/it/autogen/user/weechat_options.txt12
-rw-r--r--doc/ja/autogen/user/weechat_options.txt12
-rw-r--r--po/cs.po34
-rw-r--r--po/de.po39
-rw-r--r--po/es.po34
-rw-r--r--po/fr.po67
-rw-r--r--po/hu.po33
-rw-r--r--po/it.po39
-rw-r--r--po/ja.po39
-rw-r--r--po/pl.po39
-rw-r--r--po/pt_BR.po34
-rw-r--r--po/ru.po33
-rw-r--r--po/tr.po33
-rw-r--r--po/weechat.pot33
-rw-r--r--src/core/wee-config.c33
-rw-r--r--src/gui/gui-chat.c5
-rw-r--r--src/gui/gui-color.c79
-rw-r--r--src/gui/gui-color.h1
23 files changed, 429 insertions, 236 deletions
diff --git a/ChangeLog b/ChangeLog
index 73e56e463..ba77a15c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
Version 0.4.2 (under dev!)
--------------------------
+* core: change color format for options weechat.look.buffer_time_format and
+ weechat.look.prefix_{action|error|join|network|quit} from `${xxx}` to
+ `${color:xxx}`
* core: add secured data (encryption of passwords or private data): add new
command /secure and new file sec.conf (task #7395)
* core: rename binary and man page from "weechat-curses" to "weechat"
diff --git a/NEWS b/NEWS
index e882915f1..78defb2e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
WeeChat Release Notes
=====================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-dev, 2013-08-02
+v0.4.2-dev, 2013-08-04
This document lists important changes for each version, that require manual
@@ -16,6 +16,31 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
Version 0.4.2 (under dev!)
--------------------------
+=== Color codes in options ===
+
+The format for color codes in some options has changed. The options are
+evaluated with the function "string_eval_expression", which uses the format
+`${color:xxx}`.
+
+Following options are affected:
+
+* 'weechat.look.buffer_time_format'
+* 'weechat.look.prefix_action'
+* 'weechat.look.prefix_error'
+* 'weechat.look.prefix_join'
+* 'weechat.look.prefix_network'
+* 'weechat.look.prefix_quit'
+
+The options using old format `${xxx}` must be changed with new format
+`${color:xxx}` (where xxx is a color name or number, with optional color
+attributes).
+
+Example:
+
+----------------------------------------
+/set weechat.look.buffer_time_format "${color:251}%H${color:243}%M${color:238}%S"
+----------------------------------------
+
=== Binary and man page ===
WeeChat binary and man page have been renamed from `weechat-curses` to
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index ea686a877..ee442bf32 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -399,7 +399,7 @@
** Werte: none, highlight, message, all (Standardwert: `all`)
* [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** Beschreibung: `Format für die Zeitanzeige welche in jeder Zeile eines Buffers dargestellt wird (siehe man strftime für Platzhalter für das Datum und die Uhrzeit). Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine französische Uhr: "${lightblue}%H${white}%M${lightred}%S"`
+** Beschreibung: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:251}%H${color:243}%M${color:238}%S"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)
@@ -644,7 +644,7 @@
** Werte: -1 .. 2147483647 (Standardwert: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** Beschreibung: `Präfix, dass bei einer Action-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen`
+** Beschreibung: `prefix for action messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `" *"`)
@@ -694,22 +694,22 @@
** Werte: on, off (Standardwert: `on`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** Beschreibung: `Präfix, dass bei einer Fehler-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen`
+** Beschreibung: `prefix for error messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** Beschreibung: `Präfix, dass bei einer Join-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen`
+** Beschreibung: `prefix for join messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** Beschreibung: `Präfix, dass bei einer Netzwerk-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen`
+** Beschreibung: `prefix for network messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** Beschreibung: `Präfix, dass bei einer Quit-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen`
+** Beschreibung: `prefix for quit messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** 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 e19e37611..63a5485d9 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -399,7 +399,7 @@
** values: none, highlight, message, all (default value: `all`)
* [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** description: `time format for each line displayed in buffers (see man strftime for date/time specifiers), colors are allowed with format "${color}", for example french time: "${lightblue}%H${white}%M${lightred}%S"`
+** description: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:251}%H${color:243}%M${color:238}%S"`
** type: string
** values: any string (default value: `"%H:%M:%S"`)
@@ -644,7 +644,7 @@
** values: -1 .. 2147483647 (default value: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** description: `prefix for action messages, colors are allowed with format "${color}"`
+** description: `prefix for action messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** type: string
** values: any string (default value: `" *"`)
@@ -694,22 +694,22 @@
** values: on, off (default value: `on`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `prefix for error messages, colors are allowed with format "${color}"`
+** description: `prefix for error messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** type: string
** values: any string (default value: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** description: `prefix for join messages, colors are allowed with format "${color}"`
+** description: `prefix for join messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** type: string
** values: any string (default value: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** description: `prefix for network messages, colors are allowed with format "${color}"`
+** description: `prefix for network messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** type: string
** values: any string (default value: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** description: `prefix for quit messages, colors are allowed with format "${color}"`
+** description: `prefix for quit messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** 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 51ef5b90e..281fe0b31 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -399,7 +399,7 @@
** valeurs: none, highlight, message, all (valeur par défaut: `all`)
* [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** description: `format de date/heure pour chaque ligne affichée dans les tampons (voir man strftime pour le format de date/heure), les couleurs sont autorisées avec le format "${couleur}", par exemple l'heure française: "${lightblue}%H${white}%M${lightred}%S"`
+** description: `format de date/heure pour chaque ligne affichée dans les tampons (voir man strftime pour le format de date/heure) (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval); par exemple l'heure avec des niveaux de gris (requiert le support de 256 couleurs): "${color:251}%H${color:243}%M${color:238}%S"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"%H:%M:%S"`)
@@ -644,7 +644,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, les couleurs sont autorisées avec le format "${couleur}"`
+** description: `préfixe pour les messages d'action (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `" *"`)
@@ -694,22 +694,22 @@
** valeurs: on, off (valeur par défaut: `on`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** description: `préfixe pour les messages d'erreur, les couleurs sont autorisées avec le format "${couleur}"`
+** description: `préfixe pour les messages d'erreur (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
** 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, les couleurs sont autorisées avec le format "${couleur}"`
+** description: `préfixe pour les messages d'arrivée (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
** 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, les couleurs sont autorisées avec le format "${couleur}"`
+** description: `préfixe pour les messages réseau (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
** 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, les couleurs sont autorisées avec le format "${couleur}"`
+** description: `préfixe pour les messages de départ (note: le contenu est évalué, donc vous pouvez utiliser des couleurs avec le format "${color:xxx}", voir /help eval)`
** 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 32d5653ea..265d9e250 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -399,7 +399,7 @@
** valori: none, highlight, message, all (valore predefinito: `all`)
* [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** descrizione: `formato dell'ora per ogni riga visualizzata nei buffer (consultare man strftime per gli specificatori data/ora), i colori sono consentiti nel formato "${colore}", nell'orario italiano ad esempio: "${lightblue}%H${white}%M{lightred}%S"`
+** descrizione: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:251}%H${color:243}%M${color:238}%S"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"%H:%M:%S"`)
@@ -644,7 +644,7 @@
** valori: -1 .. 2147483647 (valore predefinito: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** descrizione: `prefisso per i messaggi di azione, colori consentiti con il formato "{color}"`
+** descrizione: `prefix for action messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `" *"`)
@@ -694,22 +694,22 @@
** valori: on, off (valore predefinito: `on`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** descrizione: `prefisso per i messaggi di errore, colori consentiti con il formato "{color}"`
+** descrizione: `prefix for error messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** descrizione: `prefisso per i messaggi di entrata, colori consentiti con il formato "{color}"`
+** descrizione: `prefix for join messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** descrizione: `prefisso per i messaggi di rete, colori consentiti con il formato "{color}"`
+** descrizione: `prefix for network messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** descrizione: `prefisso per i messaggi di uscita, colori consentiti con il formato "{color}"`
+** descrizione: `prefix for quit messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** 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 69759b07d..64a463856 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -399,7 +399,7 @@
** 値: none, highlight, message, all (デフォルト値: `all`)
* [[option_weechat.look.buffer_time_format]] *weechat.look.buffer_time_format*
-** 説明: `バッファに表示される行に付く時間フォーマット (日付/時間の指定子は strftime の man を参照)、色は "${color}" のフォーマットで指定、例えばフランス時間では: "${lightblue}%H${white}%M${lightred}%S"`
+** 説明: `time format for each line displayed in buffers (see man strftime for date/time specifiers) (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval); for example time using grayscale (requires support of 256 colors): "${color:251}%H${color:243}%M${color:238}%S"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"%H:%M:%S"`)
@@ -644,7 +644,7 @@
** 値: -1 .. 2147483647 (デフォルト値: `1`)
* [[option_weechat.look.prefix_action]] *weechat.look.prefix_action*
-** 説明: `アクションメッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
+** 説明: `prefix for action messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `" *"`)
@@ -694,22 +694,22 @@
** 値: on, off (デフォルト値: `on`)
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
-** 説明: `エラーメッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
+** 説明: `prefix for error messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"=!="`)
* [[option_weechat.look.prefix_join]] *weechat.look.prefix_join*
-** 説明: `参加メッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
+** 説明: `prefix for join messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"-->"`)
* [[option_weechat.look.prefix_network]] *weechat.look.prefix_network*
-** 説明: `ネットワークメッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
+** 説明: `prefix for network messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"--"`)
* [[option_weechat.look.prefix_quit]] *weechat.look.prefix_quit*
-** 説明: `終了メッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
+** 説明: `prefix for quit messages (note: content is evaluated, so you can use colors with format "${color:xxx}", see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"<--"`)
diff --git a/po/cs.po b/po/cs.po
index 8d81e124b..890165f43 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2530,10 +2530,14 @@ msgstr ""
"all=všechny zprávy (výchozí), message=zprávy+zváraznění, highlight=pouze "
"zvýraznění, none=nikdy nezobrazovat v hotlistu"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"formát času zobrazeného na každém řádku v bufferu (viz. man strftime pro "
"specifikaci data/času), barvy jsou povoleny ve formátu \"${barva}\", "
@@ -2836,20 +2840,34 @@ msgstr ""
"maximální počet řádků pro vložení bez dotazování uživatele (0 = vypnout tuto "
"vlastnost)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
msgid "prefix alignment (none, left, right (default))"
diff --git a/po/de.po b/po/de.po
index e65ae8c42..93a3944db 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-08-01 19:57+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -2833,10 +2833,14 @@ msgstr ""
"Nachrichten (Standard), message=Nachrichten+Highlights, highlights=nur "
"Highlights, none=Hotlist wird niemals angezeigt"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"Format für die Zeitanzeige welche in jeder Zeile eines Buffers dargestellt "
"wird (siehe man strftime für Platzhalter für das Datum und die Uhrzeit). "
@@ -3189,28 +3193,47 @@ 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, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"Präfix, dass bei einer Fehler-Nachricht angezeigt wird. Durch das Format "
"\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"Präfix, dass bei einer Netzwerk-Nachricht angezeigt wird. Durch das Format "
"\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen"
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"Präfix, dass bei einer Action-Nachricht angezeigt wird. Durch das Format "
"\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen"
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"Präfix, dass bei einer Join-Nachricht angezeigt wird. Durch das Format "
"\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen"
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"Präfix, dass bei einer Quit-Nachricht angezeigt wird. Durch das Format "
"\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen"
diff --git a/po/es.po b/po/es.po
index 23ff42e39..d6dcbe8b9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2671,10 +2671,14 @@ msgstr ""
"+resaltes, highlight=solamente resaltes,none=nunca mostrar en la lista de "
"actividad"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"formato de hora en el registro (ver el manual de strftime para los "
"especificadores de fecha/hora), se pueden usar colores con el formato "
@@ -3006,20 +3010,34 @@ 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, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
# none, left, right are option names, keep in english
diff --git a/po/fr.po b/po/fr.po
index 2d18e31cf..c7a28c3db 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:56+0200\n"
-"PO-Revision-Date: 2013-08-04 09:10+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
+"PO-Revision-Date: 2013-08-04 11:54+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -2802,15 +2802,19 @@ msgstr ""
"message=messages+highlights, highlight=highlights seulement, none=ne jamais "
"afficher dans la hotlist"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"format de date/heure pour chaque ligne affichée dans les tampons (voir man "
-"strftime pour le format de date/heure), les couleurs sont autorisées avec le "
-"format \"${couleur}\", par exemple l'heure française: \"${lightblue}%H"
-"${white}%M${lightred}%S\""
+"strftime pour le format de date/heure) (note: le contenu est évalué, donc "
+"vous pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /"
+"help eval); par exemple l'heure avec des niveaux de gris (requiert le "
+"support de 256 couleurs): \"${color:251}%H${color:243}%M${color:238}%S\""
msgid ""
"force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
@@ -3140,31 +3144,50 @@ 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, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-"préfixe pour les messages d'erreur, les couleurs sont autorisées avec le "
-"format \"${couleur}\""
+"préfixe pour les messages d'erreur (note: le contenu est évalué, donc vous "
+"pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /help "
+"eval)"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-"préfixe pour les messages réseau, les couleurs sont autorisées avec le "
-"format \"${couleur}\""
+"préfixe pour les messages réseau (note: le contenu est évalué, donc vous "
+"pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /help "
+"eval)"
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-"préfixe pour les messages d'action, les couleurs sont autorisées avec le "
-"format \"${couleur}\""
+"préfixe pour les messages d'action (note: le contenu est évalué, donc vous "
+"pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /help "
+"eval)"
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-"préfixe pour les messages d'arrivée, les couleurs sont autorisées avec le "
-"format \"${couleur}\""
+"préfixe pour les messages d'arrivée (note: le contenu est évalué, donc vous "
+"pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /help "
+"eval)"
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-"préfixe pour les messages de départ, les couleurs sont autorisées avec le "
-"format \"${couleur}\""
+"préfixe pour les messages de départ (note: le contenu est évalué, donc vous "
+"pouvez utiliser des couleurs avec le format \"${color:xxx}\", voir /help "
+"eval)"
msgid "prefix alignment (none, left, right (default))"
msgstr "alignement de préfixe (none, left, right (par défaut))"
diff --git a/po/hu.po b/po/hu.po
index b00655a3a..342fe36aa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2204,11 +2204,14 @@ msgid ""
"none=never display in hotlist"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr "új nap kezdetével megjelenő időbélyeg"
msgid ""
@@ -2456,20 +2459,34 @@ msgstr ""
"maximálisan beilleszthető sorok száma a felhasználó megkérdezése nélkül (0 = "
"szolgáltatás kikapcsolása)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
#, fuzzy
diff --git a/po/it.po b/po/it.po
index 1e34cf5ab..de8ffd2e8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:41+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2722,10 +2722,14 @@ msgstr ""
"message=messaggi+notifiche, highlight=solo notifiche, none=non viene mai "
"visualizzato nella hotlist"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"formato dell'ora per ogni riga visualizzata nei buffer (consultare man "
"strftime per gli specificatori data/ora), i colori sono consentiti nel "
@@ -3055,27 +3059,46 @@ msgstr ""
"numero massimo di righe da incollare senza conferma dell'utente (-1 = "
"disabilita questa caratteristica)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefisso per i messaggi di errore, colori consentiti con il formato "
"\"{color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefisso per i messaggi di rete, colori consentiti con il formato \"{color}\""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefisso per i messaggi di azione, colori consentiti con il formato "
"\"{color}\""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefisso per i messaggi di entrata, colori consentiti con il formato "
"\"{color}\""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefisso per i messaggi di uscita, colori consentiti con il formato "
"\"{color}\""
diff --git a/po/ja.po b/po/ja.po
index 425187591..68389a2bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-08-02 08:50+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -2693,10 +2693,14 @@ msgstr ""
"のメッセージ (デフォルト)、message=メッセージとハイライト、highlight=ハイライ"
"トのみ、none=ホットリストに表示されない"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"バッファに表示される行に付く時間フォーマット (日付/時間の指定子は strftime "
"の man を参照)、色は \"${color}\" のフォーマットで指定、例えばフランス時間で"
@@ -3008,28 +3012,47 @@ msgid ""
"max number of lines for paste without asking user (-1 = disable this feature)"
msgstr "ユーザへの確認無しにペーストする行数の最大値 (-1 = この機能を無効化)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"エラーメッセージのプレフィックス、フォーマット \"${color}\" を使えば色を使う"
"ことも可能"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"ネットワークメッセージのプレフィックス、フォーマット \"${color}\" を使えば色"
"を使うことも可能"
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"アクションメッセージのプレフィックス、フォーマット \"${color}\" を使えば色を"
"使うことも可能"
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"参加メッセージのプレフィックス、フォーマット \"${color}\" を使えば色を使うこ"
"とも可能"
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"終了メッセージのプレフィックス、フォーマット \"${color}\" を使えば色を使うこ"
"とも可能"
diff --git a/po/pl.po b/po/pl.po
index 0c9322edb..7ab23d1d5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-08-02 08:50+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2746,10 +2746,14 @@ msgstr ""
"+podświetlenia, highlight=tylko podświetlenia, none=nigdy nie wyświetlany na "
"hotliście"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"format czasu używany dla każdej linii w buforze (zobacz man strftime dla "
"specyfikatorów daty/czasu), kolory są dozwolone poprzez \"${color}\", na "
@@ -3074,28 +3078,47 @@ msgstr ""
"maksymalna ilość linii do wklejenia bez pytania użytkownika (-1 = wyłącza tę "
"opcję)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefiks dla wiadomości o błędach, kolory są dozwolone z użyciem formatu "
"\"${kolor}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefiks dla wiadomości sieciowych, kolory są dozwolone z użyciem formatu "
"\"${kolor}\""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefiks dla wiadomości o akcjach, kolory są dozwolone z użyciem formatu "
"\"${kolor}\""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefiks dla wiadomości o wejściach na kanał, kolory są dozwolone z użyciem "
"formatu \"${kolor}\""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
"prefiks dla wiadomości o wyjściach, kolory są dozwolone z użyciem formatu "
"\"${kolor}\""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 36adba7c1..50c49b759 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2610,10 +2610,14 @@ msgstr ""
"message=mensagens+destaques, highlights=apenas destaques, none=nunca mostrar "
"na lista atual"
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
"formato de tempo para cada linha mostrada nos buffers (veja man strftime "
"para especificadores de data/tempo),, cores são permitidas com o formato "
@@ -2915,20 +2919,34 @@ 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, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
msgid "prefix alignment (none, left, right (default))"
diff --git a/po/ru.po b/po/ru.po
index c6a37c774..59364ffef 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2226,11 +2226,14 @@ msgid ""
"none=never display in hotlist"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
#, fuzzy
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr "отображение маркера даты при смене дня"
msgid ""
@@ -2486,20 +2489,34 @@ msgstr ""
"максимальное количество строк, вставляемых без подтверждения (0 = отключить "
"подтверждение)"
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
#, fuzzy
diff --git a/po/tr.po b/po/tr.po
index a9f6e9f43..d47c80a35 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.2-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-07-31 18:42+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1974,10 +1974,13 @@ msgid ""
"none=never display in hotlist"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
msgid ""
@@ -2203,20 +2206,34 @@ msgid ""
"max number of lines for paste without asking user (-1 = disable this feature)"
msgstr ""
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
msgid "prefix alignment (none, left, right (default))"
diff --git a/po/weechat.pot b/po/weechat.pot
index 00e1ccb9c..5b400c4ea 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-08-04 09:08+0200\n"
+"POT-Creation-Date: 2013-08-04 11:51+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1978,10 +1978,13 @@ msgid ""
"none=never display in hotlist"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
"time format for each line displayed in buffers (see man strftime for date/"
-"time specifiers), colors are allowed with format \"${color}\", for example "
-"french time: \"${lightblue}%H${white}%M${lightred}%S\""
+"time specifiers) (note: content is evaluated, so you can use colors with "
+"format \"${color:xxx}\", see /help eval); for example time using grayscale "
+"(requires support of 256 colors): \"${color:251}%H${color:243}%M"
+"${color:238}%S\""
msgstr ""
msgid ""
@@ -2207,20 +2210,34 @@ msgid ""
"max number of lines for paste without asking user (-1 = disable this feature)"
msgstr ""
-msgid "prefix for error messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for error messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
msgid ""
-"prefix for network messages, colors are allowed with format \"${color}\""
+"prefix for network messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for action messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for action messages (note: content is evaluated, so you can use "
+"colors with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for join messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for join messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
-msgid "prefix for quit messages, colors are allowed with format \"${color}\""
+#. TRANSLATORS: string "${color:xxx}" must NOT be translated
+msgid ""
+"prefix for quit messages (note: content is evaluated, so you can use colors "
+"with format \"${color:xxx}\", see /help eval)"
msgstr ""
msgid "prefix alignment (none, left, right (default))"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index fb86fe2ad..88f4cf881 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -1958,10 +1958,12 @@ config_weechat_init_options ()
config_look_buffer_time_format = config_file_new_option (
weechat_config_file, ptr_section,
"buffer_time_format", "string",
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
N_("time format for each line displayed in buffers (see man strftime "
- "for date/time specifiers), colors are allowed with format "
- "\"${color}\", for example french time: "
- "\"${lightblue}%H${white}%M${lightred}%S\""),
+ "for date/time specifiers) (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval); for "
+ "example time using grayscale (requires support of 256 colors): "
+ "\"${color:251}%H${color:243}%M${color:238}%S\""),
NULL, 0, 0, "%H:%M:%S", NULL, 0, NULL, NULL, &config_change_buffer_time_format, NULL, NULL, NULL);
config_look_color_basic_force_bold = config_file_new_option (
weechat_config_file, ptr_section,
@@ -2272,36 +2274,41 @@ 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, colors are allowed with format "
- "\"${color}\""),
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
+ N_("prefix for error messages (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval)"),
NULL, 0, 0, GUI_CHAT_PREFIX_ERROR_DEFAULT,
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, colors are allowed with format "
- "\"${color}\""),
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
+ N_("prefix for network messages (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval)"),
NULL, 0, 0, GUI_CHAT_PREFIX_NETWORK_DEFAULT,
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, colors are allowed with format "
- "\"${color}\""),
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
+ N_("prefix for action messages (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval)"),
NULL, 0, 0, GUI_CHAT_PREFIX_ACTION_DEFAULT,
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, colors are allowed with format "
- "\"${color}\""),
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
+ N_("prefix for join messages (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval)"),
NULL, 0, 0, GUI_CHAT_PREFIX_JOIN_DEFAULT,
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, colors are allowed with format "
- "\"${color}\""),
+ /* TRANSLATORS: string "${color:xxx}" must NOT be translated */
+ N_("prefix for quit messages (note: content is evaluated, so you can "
+ "use colors with format \"${color:xxx}\", see /help eval)"),
NULL, 0, 0, GUI_CHAT_PREFIX_QUIT_DEFAULT,
NULL, 0, NULL, NULL, &config_change_prefix, NULL, NULL, NULL);
config_look_prefix_align = config_file_new_option (
diff --git a/src/gui/gui-chat.c b/src/gui/gui-chat.c
index 22b0acfe2..b1045f6b2 100644
--- a/src/gui/gui-chat.c
+++ b/src/gui/gui-chat.c
@@ -32,6 +32,7 @@
#include "../core/weechat.h"
#include "../core/wee-config.h"
+#include "../core/wee-eval.h"
#include "../core/wee-hashtable.h"
#include "../core/wee-hook.h"
#include "../core/wee-string.h"
@@ -119,7 +120,7 @@ gui_chat_prefix_build ()
ptr_prefix);
if (pos_color)
- gui_chat_prefix[i] = gui_color_string_replace_colors (prefix);
+ gui_chat_prefix[i] = eval_expression (prefix, NULL, NULL, NULL);
else
gui_chat_prefix[i] = strdup (prefix);
}
@@ -373,7 +374,7 @@ gui_chat_get_time_string (time_t date)
if (strstr (text_time, "${"))
{
- text_with_color = gui_color_string_replace_colors (text_time);
+ text_with_color = eval_expression (text_time, NULL, NULL, NULL);
if (text_with_color)
{
if (strcmp (text_time, text_with_color) != 0)
diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c
index dee38132c..fb38aa430 100644
--- a/src/gui/gui-color.c
+++ b/src/gui/gui-color.c
@@ -583,85 +583,6 @@ gui_color_decode (const char *string, const char *replacement)
}
/*
- * Replaces colors in string with color codes.
- *
- * Colors are using format: ${name} where name is a color name.
- */
-
-char *
-gui_color_string_replace_colors (const char *string)
-{
- int length, length_color, index_string, index_result;
- char *result, *result2, *color_name;
- const char *pos_end_name, *ptr_color;
-
- if (!string)
- return NULL;
-
- length = strlen (string) + 1;
- result = malloc (length);
- if (result)
- {
- index_string = 0;
- index_result = 0;
- while (string[index_string])
- {
- if ((string[index_string] == '\\')
- && (string[index_string + 1] == '$'))
- {
- index_string++;
- result[index_result++] = string[index_string++];
- }
- else if ((string[index_string] == '$')
- && (string[index_string + 1] == '{'))
- {
- pos_end_name = strchr (string + index_string + 2, '}');
- if (pos_end_name)
- {
- color_name = string_strndup (string + index_string + 2,
- pos_end_name - (string + index_string + 2));
- if (color_name)
- {
- ptr_color = gui_color_get_custom (color_name);
- if (ptr_color)
- {
- length_color = strlen (ptr_color);
- length += length_color;
- result2 = realloc (result, length);
- if (!result2)
- {
- if (result)
- free (result);
- free (color_name);
- return NULL;
- }
- result = result2;
- strcpy (result + index_result, ptr_color);
- index_result += length_color;
- index_string += pos_end_name - string -
- index_string + 1;
- }
- else
- result[index_result++] = string[index_string++];
-
- free (color_name);
- }
- else
- result[index_result++] = string[index_string++];
- }
- else
- result[index_result++] = string[index_string++];
- }
- else
- result[index_result++] = string[index_string++];
- }
- result[index_result] = '\0';
- }
-
- return result;
-}
-
-/*
* Frees a color.
*/
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index 47c2aae88..91e56fe60 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -165,7 +165,6 @@ extern int gui_color_attr_get_flag (char c);
extern void gui_color_attr_build_string (int color, char *str_attr);
extern const char *gui_color_get_custom (const char *color_name);
extern char *gui_color_decode (const char *string, const char *replacement);
-extern char *gui_color_string_replace_colors (const char *string);
extern void gui_color_free (struct t_gui_color *color);
extern void gui_color_palette_alloc_structs ();
extern int gui_color_palette_get_alias (const char *alias);
generated by cgit debian/1.2.3+git2.25.1-1-2-gaceb0 (git 2.25.1) at 2025-04-19 08:00:35 +0000