Replace the 10 nick color options and number of nick colors by a single option "weechat.color.chat_nick_colors" (comma separated list of colors)

25 files changed, 493 insertions, 726 deletions

diff --git a/ChangeLog b/ChangeLog
index f1e6c863a..605d85ea2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Version 0.3.4 (under dev!)
 
 * core: add 256 colors support, new section "palette" in weechat.conf
   (task #6834)
+* core: replace the 10 nick color options and number of nick colors by a single
+  option "weechat.color.chat_nick_colors" (comma separated list of colors)
 * core: add support of python 2.7 in cmake and configure (debian #606989)
 * core: add color support in option weechat.look.buffer_time_format
 * core: call to hook_config when config option is created
diff --git a/NEWS b/NEWS
index 9086e905d..00ff1c192 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 WeeChat News
 ============
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-rc1, 2010-12-10
+v0.3.4-rc1, 2010-12-20
 
 
 Version 0.3.4 (under dev!)
@@ -9,8 +9,13 @@ Version 0.3.4 (under dev!)
 
 Important release notes:
 
-* if you are using `/upgrade` from a previous release, some nick prefixes can
-  be wrong, so it is recommended to do `/allchan names`.
+* if you are using `/upgrade` from a previous release:
+** some nick prefixes can be wrong, so it is recommended to do `/allchan names`
+** nick colors are defined with a new option "weechat.color.chat_nick_colors",
+   therefore old options "weechat.color.chat_nick_color1..10" will be lost when
+   upgrading
+** nick colors in messages displayed will be wrong if you changed some nick colors
+   (old default colors will be used)
 * some IRC options have been renamed, before upgrading to this version, note
   value for old options, and set them again with new name:
 ** options moved from 'network' section to servers (with global value, and server
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 2db81d821..cc20294ac 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -48,55 +48,10 @@
 ** Typ: Farbe
 ** Werte: ein Farbname (Standardwert: `lightcyan`)
 
-* *weechat.color.chat_nick_color01*
-** Beschreibung: `Textfarbe #1 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** Beschreibung: `Textfarbe #2 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** Beschreibung: `Textfarbe #3 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `green`)
-
-* *weechat.color.chat_nick_color04*
-** Beschreibung: `Textfarbe #4 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** Beschreibung: `Textfarbe #5 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** Beschreibung: `Textfarbe #6 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `default`)
-
-* *weechat.color.chat_nick_color07*
-** Beschreibung: `Textfarbe #7 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** Beschreibung: `Textfarbe #8 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** Beschreibung: `Textfarbe #9 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** Beschreibung: `Textfarbe #10 für Nick`
-** Typ: Farbe
-** Werte: ein Farbname (Standardwert: `blue`)
+* *weechat.color.chat_nick_colors*
+** Beschreibung: `text color for nicks (comma separated list of colors)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)
 
 * *weechat.color.chat_nick_other*
 ** Beschreibung: `Farbe des anderen Nicknamens in einem privaten Buffer`
@@ -353,11 +308,6 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"%H:%M:%S"`)
 
-* *weechat.look.color_nicks_number*
-** Beschreibung: `Anzahl der Farben die für die Nicknamen genutzt werden sollen`
-** Typ: integer
-** Werte: 1 .. 10 (Standardwert: `10`)
-
 * *weechat.look.color_real_white*
 ** Beschreibung: `Falls diese Option aktiviert ist, wird echtes weiß als Farbe genutzt. In der Standardeinstellung ist diese Option allerdings deaktiviert damit es zu keinen Problemen mit Terminals kommt die einen weißen Hintergrund nutzen (falls man keinen weißen Hintergrund nutzen sollte dann ist es ratsam diese Option zu aktivieren, andernfalls wird die voreingestellte Vordergrundfarbe des Terminals genutzt)`
 ** Typ: boolesch
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 7814c45da..29cc76be6 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -48,55 +48,10 @@
 ** type: color
 ** values: a color name (default value: `lightcyan`)
 
-* *weechat.color.chat_nick_color01*
-** description: `text color #1 for nick`
-** type: color
-** values: a color name (default value: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** description: `text color #2 for nick`
-** type: color
-** values: a color name (default value: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** description: `text color #3 for nick`
-** type: color
-** values: a color name (default value: `green`)
-
-* *weechat.color.chat_nick_color04*
-** description: `text color #4 for nick`
-** type: color
-** values: a color name (default value: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** description: `text color #5 for nick`
-** type: color
-** values: a color name (default value: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** description: `text color #6 for nick`
-** type: color
-** values: a color name (default value: `default`)
-
-* *weechat.color.chat_nick_color07*
-** description: `text color #7 for nick`
-** type: color
-** values: a color name (default value: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** description: `text color #8 for nick`
-** type: color
-** values: a color name (default value: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** description: `text color #9 for nick`
-** type: color
-** values: a color name (default value: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** description: `text color #10 for nick`
-** type: color
-** values: a color name (default value: `blue`)
+* *weechat.color.chat_nick_colors*
+** description: `text color for nicks (comma separated list of colors)`
+** type: string
+** values: any string (default value: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)
 
 * *weechat.color.chat_nick_other*
 ** description: `text color for other nick in private buffer`
@@ -353,11 +308,6 @@
 ** type: string
 ** values: any string (default value: `"%H:%M:%S"`)
 
-* *weechat.look.color_nicks_number*
-** description: `number of colors to use for nicks colors`
-** type: integer
-** values: 1 .. 10 (default value: `10`)
-
 * *weechat.look.color_real_white*
 ** description: `if set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)`
 ** type: boolean
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index a3529eaaf..60223aa68 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -48,55 +48,10 @@
 ** type: couleur
 ** valeurs: un nom de couleur (valeur par défaut: `lightcyan`)
 
-* *weechat.color.chat_nick_color01*
-** description: `couleur du texte n°1 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** description: `couleur du texte n°2 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** description: `couleur du texte n°3 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `green`)
-
-* *weechat.color.chat_nick_color04*
-** description: `couleur du texte n°4 le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** description: `couleur du texte n°5 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** description: `couleur du texte n°6 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `default`)
-
-* *weechat.color.chat_nick_color07*
-** description: `couleur du texte n°7 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** description: `couleur du texte n°8 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** description: `couleur du texte n°9 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** description: `couleur du texte n°10 pour le pseudo`
-** type: couleur
-** valeurs: un nom de couleur (valeur par défaut: `blue`)
+* *weechat.color.chat_nick_colors*
+** description: `couleur du texte pour les pseudos (liste de couleurs séparées par une virgule)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)
 
 * *weechat.color.chat_nick_other*
 ** description: `couleur du texte pour l'autre pseudo dans le tampon privée`
@@ -353,11 +308,6 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"%H:%M:%S"`)
 
-* *weechat.look.color_nicks_number*
-** description: `nombre de couleurs à utiliser pour les couleurs des pseudos`
-** type: entier
-** valeurs: 1 .. 10 (valeur par défaut: `10`)
-
 * *weechat.look.color_real_white*
 ** description: `si activé, utilise la vraie couleur blanche, désactivé par défaut pour les terminaux avec un fond blanc (si vous n'utilisez jamais de fond blanc, vous devriez activer cette option pour voir du vrai blanc au lieu de la couleur d'avant plan par défaut du terminal)`
 ** type: booléen
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 943c5c6af..9a8e2f0b7 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -48,55 +48,10 @@
 ** tipo: colore
 ** valori: un nome colore (valore predefinito: `lightcyan`)
 
-* *weechat.color.chat_nick_color01*
-** descrizione: `colore del testo #1 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `cyan`)
-
-* *weechat.color.chat_nick_color02*
-** descrizione: `colore del testo #2 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `magenta`)
-
-* *weechat.color.chat_nick_color03*
-** descrizione: `colore del testo #3 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `green`)
-
-* *weechat.color.chat_nick_color04*
-** descrizione: `colore del testo #4 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `brown`)
-
-* *weechat.color.chat_nick_color05*
-** descrizione: `colore del testo #5 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightblue`)
-
-* *weechat.color.chat_nick_color06*
-** descrizione: `colore del testo #6 per il nick`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `default`)
-
-* *weechat.color.chat_nick_color07*
-** descrizione: `colore del testo #7 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightcyan`)
-
-* *weechat.color.chat_nick_color08*
-** descrizione: `colore del testo #8 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightmagenta`)
-
-* *weechat.color.chat_nick_color09*
-** descrizione: `colore del testo #9 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `lightgreen`)
-
-* *weechat.color.chat_nick_color10*
-** descrizione: `colore del testo #10 per il nick<`
-** tipo: colore
-** valori: un nome colore (valore predefinito: `blue`)
+* *weechat.color.chat_nick_colors*
+** descrizione: `text color for nicks (comma separated list of colors)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`)
 
 * *weechat.color.chat_nick_other*
 ** descrizione: `colore del testo per gli altri nick nel buffer privato`
@@ -353,11 +308,6 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"%H:%M:%S"`)
 
-* *weechat.look.color_nicks_number*
-** descrizione: `numero di colori da utilizzare per i colori dei nick`
-** tipo: intero
-** valori: 1 .. 10 (valore predefinito: `10`)
-
 * *weechat.look.color_real_white*
 ** descrizione: `se impostato, utilizza il colore bianco reale, disabilitato sui terminali con lo sfondo bianco (se non utilizzato, l'opzione dovrebbe essere attivata per visualizzare il bianco reale invece del colore di primo piano predefinito del terminale)`
 ** tipo: bool
diff --git a/po/cs.po b/po/cs.po
index bc5c505a2..4a43bc3f0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-06 11:55+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1814,9 +1814,6 @@ msgstr ""
 "časová známka použita v logovacích souborech (použijte manuálovou stránku "
 "strftime pro spcifikátory data/času)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "počet barev použitých pro barvy přezdívek"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2105,42 +2102,16 @@ msgstr "barva textu pro jméno kanálu"
 msgid "text color for nicks in chat window"
 msgstr "barva textu přezdívky v okně rozhovoru"
 
+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "barva textu přezdívky v okně rozhovoru"
+
 msgid "text color for local nick in chat window"
 msgstr "barva textu pro lokální přezdívku v okně rozhovoru"
 
 msgid "text color for other nick in private buffer"
 msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
 
-msgid "text color #1 for nick"
-msgstr "barva textu 1. přezdívky"
-
-msgid "text color #2 for nick"
-msgstr "barva textu 2. přezdívky"
-
-msgid "text color #3 for nick"
-msgstr "barva textu 3. přezdívky"
-
-msgid "text color #4 for nick"
-msgstr "barva textu 4. přezdívky"
-
-msgid "text color #5 for nick"
-msgstr "barva textu 5. přezdívky"
-
-msgid "text color #6 for nick"
-msgstr "barva textu 6. přezdívky"
-
-msgid "text color #7 for nick"
-msgstr "barva textu 7. přezdívky"
-
-msgid "text color #8 for nick"
-msgstr "barva textu 8. přezdívky"
-
-msgid "text color #9 for nick"
-msgstr "barva textu 9. přezdívky"
-
-msgid "text color #10 for nick"
-msgstr "barva textu 10. přezdívky"
-
 msgid "text color for hostnames"
 msgstr "barva textu jména hosta"
 
@@ -2969,10 +2940,9 @@ msgstr "demo zpráva bez prefixu"
 msgid "%sdemo message with error prefix"
 msgstr "%sdemo zpráva s chybovým prefixem"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
-"barvy: %s buffer %s přezdívka1 %s přezdívka2 %s přezdívka3 %s přezdívka4"
+#, fuzzy
+msgid "colors"
+msgstr "barva"
 
 msgid "Available infos:"
 msgstr "Dostupné informace:"
@@ -7168,6 +7138,43 @@ msgstr ""
 msgid "Pointer"
 msgstr "Ukazatel"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "počet barev použitých pro barvy přezdívek"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "barva textu 1. přezdívky"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "barva textu 2. přezdívky"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "barva textu 3. přezdívky"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "barva textu 4. přezdívky"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "barva textu 5. přezdívky"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "barva textu 6. přezdívky"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "barva textu 7. přezdívky"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "barva textu 8. přezdívky"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "barva textu 9. přezdívky"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "barva textu 10. přezdívky"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr ""
+#~ "barvy: %s buffer %s přezdívka1 %s přezdívka2 %s přezdívka3 %s přezdívka4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server server] příjemce[,příjemce] text"
 
diff --git a/po/de.po b/po/de.po
index 21145f59b..09e85f0d9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-12-07 23:21+0100\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1884,9 +1884,6 @@ msgstr ""
 "\"${Farbe}\" ist es möglich eine Farbauswahl zu treffen, zum Beispiel eine "
 "französische Uhr: \"${lightblue}%H${white}%M${lightred}%S\""
 
-msgid "number of colors to use for nicks colors"
-msgstr "Anzahl der Farben die für die Nicknamen genutzt werden sollen"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2205,42 +2202,16 @@ msgstr "Farbe der Channel-Namens"
 msgid "text color for nicks in chat window"
 msgstr "Farbe für Nicks im Chat-Fenster"
 
+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "Farbe für Nicks im Chat-Fenster"
+
 msgid "text color for local nick in chat window"
 msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster."
 
 msgid "text color for other nick in private buffer"
 msgstr "Farbe des anderen Nicknamens in einem privaten Buffer"
 
-msgid "text color #1 for nick"
-msgstr "Textfarbe #1 für Nick"
-
-msgid "text color #2 for nick"
-msgstr "Textfarbe #2 für Nick"
-
-msgid "text color #3 for nick"
-msgstr "Textfarbe #3 für Nick"
-
-msgid "text color #4 for nick"
-msgstr "Textfarbe #4 für Nick"
-
-msgid "text color #5 for nick"
-msgstr "Textfarbe #5 für Nick"
-
-msgid "text color #6 for nick"
-msgstr "Textfarbe #6 für Nick"
-
-msgid "text color #7 for nick"
-msgstr "Textfarbe #7 für Nick"
-
-msgid "text color #8 for nick"
-msgstr "Textfarbe #8 für Nick"
-
-msgid "text color #9 for nick"
-msgstr "Textfarbe #9 für Nick"
-
-msgid "text color #10 for nick"
-msgstr "Textfarbe #10 für Nick"
-
 msgid "text color for hostnames"
 msgstr "Textfarbe für Host-Namen"
 
@@ -3108,9 +3079,9 @@ msgstr "Demo-Nachricht, ohne Präfix"
 msgid "%sdemo message with error prefix"
 msgstr "%sDemo-Nachricht mit fehlerhaftem Präfix"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "Farben: %s Buffer %s Nick1 %s Nick2 %s Nick3 %s Nick4"
+#, fuzzy
+msgid "colors"
+msgstr "Farbe"
 
 msgid "Available infos:"
 msgstr "verfügbare Informationen:"
@@ -7481,6 +7452,42 @@ msgstr "Hashtable (Ausgabe)"
 msgid "Pointer"
 msgstr "Pointer"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "Anzahl der Farben die für die Nicknamen genutzt werden sollen"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "Textfarbe #1 für Nick"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "Textfarbe #2 für Nick"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "Textfarbe #3 für Nick"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "Textfarbe #4 für Nick"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "Textfarbe #5 für Nick"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "Textfarbe #6 für Nick"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "Textfarbe #7 für Nick"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "Textfarbe #8 für Nick"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "Textfarbe #9 für Nick"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "Textfarbe #10 für Nick"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "Farben: %s Buffer %s Nick1 %s Nick2 %s Nick3 %s Nick4"
+
 #~ msgid ""
 #~ "  server: send to this server (internal name)\n"
 #~ "nickname: user to send notice to\n"
diff --git a/po/es.po b/po/es.po
index fa0ba31c3..4161cdea0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-06 11:56+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1829,9 +1829,6 @@ msgstr ""
 "formato de hora en el registro (ver el manual de strftime para los "
 "especificadores de fecha/hora)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "número de colores para usar en los colores de nombres de usuario"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2129,42 +2126,16 @@ msgstr "color para los nombres de los canales"
 msgid "text color for nicks in chat window"
 msgstr "color para los apodos en la ventana de conversación"
 
+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "color para los apodos en la ventana de conversación"
+
 msgid "text color for local nick in chat window"
 msgstr "color para el apodo propio en la ventana de conversación"
 
 msgid "text color for other nick in private buffer"
 msgstr "color para el otro apodo en una conversación privada"
 
-msgid "text color #1 for nick"
-msgstr "color para el apodo #1"
-
-msgid "text color #2 for nick"
-msgstr "color para el apodo #2"
-
-msgid "text color #3 for nick"
-msgstr "color para el apodo #3"
-
-msgid "text color #4 for nick"
-msgstr "color para el apodo #4"
-
-msgid "text color #5 for nick"
-msgstr "color para el apodo #5"
-
-msgid "text color #6 for nick"
-msgstr "color para el apodo #6"
-
-msgid "text color #7 for nick"
-msgstr "color para el apodo #7"
-
-msgid "text color #8 for nick"
-msgstr "color para el apodo #8"
-
-msgid "text color #9 for nick"
-msgstr "color para el apodo #9"
-
-msgid "text color #10 for nick"
-msgstr "color para el apodo #10"
-
 msgid "text color for hostnames"
 msgstr "color para los hostnames"
 
@@ -3013,9 +2984,9 @@ msgstr "mensaje de demostración sin un prefijo"
 msgid "%sdemo message with error prefix"
 msgstr "%smensaje de demostración con prefijo de error"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "colores: %s buffer %s apodo1 %s apodo2 %s apodo3 %s apodo4"
+#, fuzzy
+msgid "colors"
+msgstr "color"
 
 msgid "Available infos:"
 msgstr "Infos disponibles:"
@@ -7257,6 +7228,42 @@ msgstr ""
 msgid "Pointer"
 msgstr "Puntero"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "número de colores para usar en los colores de nombres de usuario"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "color para el apodo #1"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "color para el apodo #2"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "color para el apodo #3"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "color para el apodo #4"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "color para el apodo #5"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "color para el apodo #6"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "color para el apodo #7"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "color para el apodo #8"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "color para el apodo #9"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "color para el apodo #10"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "colores: %s buffer %s apodo1 %s apodo2 %s apodo3 %s apodo4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server servidor] destino[,destino] texto"
 
diff --git a/po/fr.po b/po/fr.po
index 8d18e669b..7dd59334a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
-"PO-Revision-Date: 2010-12-19 19:54+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
+"PO-Revision-Date: 2010-12-20 12:15+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -1853,9 +1853,6 @@ msgstr ""
 "format \"${couleur}\", par exemple l'heure française: \"${lightblue}%H"
 "${white}%M${lightred}%S\""
 
-msgid "number of colors to use for nicks colors"
-msgstr "nombre de couleurs à utiliser pour les couleurs des pseudos"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2161,42 +2158,17 @@ msgstr "couleur du texte pour le nom des canaux"
 msgid "text color for nicks in chat window"
 msgstr "couleur du texte pour l'heure dans la fenêtre de discussion"
 
+msgid "text color for nicks (comma separated list of colors)"
+msgstr ""
+"couleur du texte pour les pseudos (liste de couleurs séparées par une "
+"virgule)"
+
 msgid "text color for local nick in chat window"
 msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion"
 
 msgid "text color for other nick in private buffer"
 msgstr "couleur du texte pour l'autre pseudo dans le tampon privée"
 
-msgid "text color #1 for nick"
-msgstr "couleur du texte n°1 pour le pseudo"
-
-msgid "text color #2 for nick"
-msgstr "couleur du texte n°2 pour le pseudo"
-
-msgid "text color #3 for nick"
-msgstr "couleur du texte n°3 pour le pseudo"
-
-msgid "text color #4 for nick"
-msgstr "couleur du texte n°4 le pseudo"
-
-msgid "text color #5 for nick"
-msgstr "couleur du texte n°5 pour le pseudo"
-
-msgid "text color #6 for nick"
-msgstr "couleur du texte n°6 pour le pseudo"
-
-msgid "text color #7 for nick"
-msgstr "couleur du texte n°7 pour le pseudo"
-
-msgid "text color #8 for nick"
-msgstr "couleur du texte n°8 pour le pseudo"
-
-msgid "text color #9 for nick"
-msgstr "couleur du texte n°9 pour le pseudo"
-
-msgid "text color #10 for nick"
-msgstr "couleur du texte n°10 pour le pseudo"
-
 msgid "text color for hostnames"
 msgstr "couleur du texte pour les noms d'hôtes"
 
@@ -3064,9 +3036,8 @@ msgstr "message de démonstration sans préfixe"
 msgid "%sdemo message with error prefix"
 msgstr "%smessage de démonstration avec préfixe d'erreur"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "couleurs: %s tampon %s pseudo1 %s pseudo2 %s pseudo3 %s pseudo4"
+msgid "colors"
+msgstr "couleurs"
 
 msgid "Available infos:"
 msgstr "Infos disponibles:"
diff --git a/po/hu.po b/po/hu.po
index 10461645a..7d1d4941d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-05 17:17+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1631,9 +1631,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr "új nap kezdetével megjelenő időbélyeg"
 
-msgid "number of colors to use for nicks colors"
-msgstr "nevek színezéséhez használt színek száma"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1911,6 +1908,10 @@ msgid "text color for nicks in chat window"
 msgstr "idő színe a beszédablakban"
 
 #, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "idő színe a beszédablakban"
+
+#, fuzzy
 msgid "text color for local nick in chat window"
 msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
 
@@ -1919,46 +1920,6 @@ msgid "text color for other nick in private buffer"
 msgstr "másik fél nevének színe privát beszélgetésben"
 
 #, fuzzy
-msgid "text color #1 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #2 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #3 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #4 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #5 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #6 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #7 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #8 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #9 for nick"
-msgstr "név színe"
-
-#, fuzzy
-msgid "text color #10 for nick"
-msgstr "név színe"
-
-#, fuzzy
 msgid "text color for hostnames"
 msgstr "gépnevek színe"
 
@@ -2779,9 +2740,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "üzenetek színe"
 
 msgid "Available infos:"
 msgstr ""
@@ -6888,6 +6849,49 @@ msgstr ""
 msgid "Pointer"
 msgstr "perc"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "nevek színezéséhez használt színek száma"
+
+#, fuzzy
+#~ msgid "text color #1 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #2 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #3 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #4 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #5 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #6 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #7 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #8 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #9 for nick"
+#~ msgstr "név színe"
+
+#, fuzzy
+#~ msgid "text color #10 for nick"
+#~ msgstr "név színe"
+
 #, fuzzy
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "fogadó [,fogadó] szöveg"
diff --git a/po/it.po b/po/it.po
index de0509d0b..04900e2f3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-12-10 14:11+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1839,9 +1839,6 @@ msgstr ""
 "formato \"${colore}\", nell'orario italiano ad esempio: \"${lightblue}%H"
 "${white}%M{lightred}%S\""
 
-msgid "number of colors to use for nicks colors"
-msgstr "numero di colori da utilizzare per i colori dei nick"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2144,42 +2141,16 @@ msgstr "colore del testo per i nomi dei canali"
 msgid "text color for nicks in chat window"
 msgstr "colore del testo per i nick nella finestra di chat"
 
+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "colore del testo per i nick nella finestra di chat"
+
 msgid "text color for local nick in chat window"
 msgstr "colore del testo per il nick locale nella finestra di chat"
 
 msgid "text color for other nick in private buffer"
 msgstr "colore del testo per gli altri nick nel buffer privato"
 
-msgid "text color #1 for nick"
-msgstr "colore del testo #1 per il nick"
-
-msgid "text color #2 for nick"
-msgstr "colore del testo #2 per il nick"
-
-msgid "text color #3 for nick"
-msgstr "colore del testo #3 per il nick"
-
-msgid "text color #4 for nick"
-msgstr "colore del testo #4 per il nick"
-
-msgid "text color #5 for nick"
-msgstr "colore del testo #5 per il nick"
-
-msgid "text color #6 for nick"
-msgstr "colore del testo #6 per il nick"
-
-msgid "text color #7 for nick"
-msgstr "colore del testo #7 per il nick<"
-
-msgid "text color #8 for nick"
-msgstr "colore del testo #8 per il nick<"
-
-msgid "text color #9 for nick"
-msgstr "colore del testo #9 per il nick<"
-
-msgid "text color #10 for nick"
-msgstr "colore del testo #10 per il nick<"
-
 msgid "text color for hostnames"
 msgstr "colore del testo per i nomi host"
 
@@ -3031,9 +3002,9 @@ msgstr "messaggio dimostrativo senza prefisso"
 msgid "%sdemo message with error prefix"
 msgstr "%smessaggio dimostrativo con il prefisso di errore"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "colori: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#, fuzzy
+msgid "colors"
+msgstr "colore"
 
 msgid "Available infos:"
 msgstr "Informazioni disponibili:"
@@ -7310,6 +7281,42 @@ msgstr "Tabella hash (output)"
 msgid "Pointer"
 msgstr "Puntatore"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "numero di colori da utilizzare per i colori dei nick"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "colore del testo #1 per il nick"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "colore del testo #2 per il nick"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "colore del testo #3 per il nick"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "colore del testo #4 per il nick"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "colore del testo #5 per il nick"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "colore del testo #6 per il nick"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "colore del testo #7 per il nick<"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "colore del testo #8 per il nick<"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "colore del testo #9 per il nick<"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "colore del testo #10 per il nick<"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "colori: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+
 #~ msgid ""
 #~ "  server: send to this server (internal name)\n"
 #~ "nickname: user to send notice to\n"
diff --git a/po/pl.po b/po/pl.po
index 28411bdb3..101b68d2b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-06 11:56+0100\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1838,9 +1838,6 @@ msgstr ""
 "format czasu użyty w plikach z logami (zobacz man strftime dla "
 "specyfikatorów daty/czasu)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "liczba kolorów do użycia dla kolorowania nicków"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -2134,42 +2131,16 @@ msgstr "kolor nazw kanałów"
 msgid "text color for nicks in chat window"
 msgstr "kolor nicków w oknie rozmowy"
 
+#, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "kolor nicków w oknie rozmowy"
+
 msgid "text color for local nick in chat window"
 msgstr "kolor lokalnego nicka w oknie rozmowy"
 
 msgid "text color for other nick in private buffer"
 msgstr "kolor innego nicka w prywatnym buforze"
 
-msgid "text color #1 for nick"
-msgstr "kolor #1 nicka"
-
-msgid "text color #2 for nick"
-msgstr "kolor #2 nicka"
-
-msgid "text color #3 for nick"
-msgstr "kolor #3 nicka"
-
-msgid "text color #4 for nick"
-msgstr "kolor #4 nicka"
-
-msgid "text color #5 for nick"
-msgstr "kolor #5 nicka"
-
-msgid "text color #6 for nick"
-msgstr "kolor #6 nicka"
-
-msgid "text color #7 for nick"
-msgstr "kolor #7 nicka"
-
-msgid "text color #8 for nick"
-msgstr "kolor #8 nicka"
-
-msgid "text color #9 for nick"
-msgstr "kolor #9 nicka"
-
-msgid "text color #10 for nick"
-msgstr "kolor #10 nicka"
-
 msgid "text color for hostnames"
 msgstr "kolor nazw hostów"
 
@@ -3004,9 +2975,9 @@ msgstr "testowa wiadomość bez przedrostka"
 msgid "%sdemo message with error prefix"
 msgstr "%stestowa wiadomość z przedrostkiem"
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr "kolory: %s bufor %s nick1 %s nick2 %s nick3 %s nick4"
+#, fuzzy
+msgid "colors"
+msgstr "kolor"
 
 msgid "Available infos:"
 msgstr "Dostępne informacje:"
@@ -7187,6 +7158,42 @@ msgstr ""
 msgid "Pointer"
 msgstr "Wskaźnik"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "liczba kolorów do użycia dla kolorowania nicków"
+
+#~ msgid "text color #1 for nick"
+#~ msgstr "kolor #1 nicka"
+
+#~ msgid "text color #2 for nick"
+#~ msgstr "kolor #2 nicka"
+
+#~ msgid "text color #3 for nick"
+#~ msgstr "kolor #3 nicka"
+
+#~ msgid "text color #4 for nick"
+#~ msgstr "kolor #4 nicka"
+
+#~ msgid "text color #5 for nick"
+#~ msgstr "kolor #5 nicka"
+
+#~ msgid "text color #6 for nick"
+#~ msgstr "kolor #6 nicka"
+
+#~ msgid "text color #7 for nick"
+#~ msgstr "kolor #7 nicka"
+
+#~ msgid "text color #8 for nick"
+#~ msgstr "kolor #8 nicka"
+
+#~ msgid "text color #9 for nick"
+#~ msgstr "kolor #9 nicka"
+
+#~ msgid "text color #10 for nick"
+#~ msgstr "kolor #10 nicka"
+
+#~ msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+#~ msgstr "kolory: %s bufor %s nick1 %s nick2 %s nick3 %s nick4"
+
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "[-server serwer] odbiorca[,odbiorca] tekst"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58355428e..3e3f5fb15 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-13 09:26+0100\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1460,9 +1460,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr ""
 
-msgid "number of colors to use for nicks colors"
-msgstr ""
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1699,40 +1696,13 @@ msgstr ""
 msgid "text color for nicks in chat window"
 msgstr ""
 
-msgid "text color for local nick in chat window"
-msgstr ""
-
-msgid "text color for other nick in private buffer"
-msgstr ""
-
-msgid "text color #1 for nick"
-msgstr ""
-
-msgid "text color #2 for nick"
-msgstr ""
-
-msgid "text color #3 for nick"
-msgstr ""
-
-msgid "text color #4 for nick"
+msgid "text color for nicks (comma separated list of colors)"
 msgstr ""
 
-msgid "text color #5 for nick"
-msgstr ""
-
-msgid "text color #6 for nick"
-msgstr ""
-
-msgid "text color #7 for nick"
-msgstr ""
-
-msgid "text color #8 for nick"
-msgstr ""
-
-msgid "text color #9 for nick"
+msgid "text color for local nick in chat window"
 msgstr ""
 
-msgid "text color #10 for nick"
+msgid "text color for other nick in private buffer"
 msgstr ""
 
 msgid "text color for hostnames"
@@ -2468,9 +2438,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "cor"
 
 msgid "Available infos:"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index bc378884d..af19617ee 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.4-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+0100\n"
 "PO-Revision-Date: 2010-11-05 17:17+0100\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1640,9 +1640,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr "отображение маркера даты при смене дня"
 
-msgid "number of colors to use for nicks colors"
-msgstr "количество цветов для раскрашивания ников"
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1929,6 +1926,10 @@ msgid "text color for nicks in chat window"
 msgstr "цвет времени в окне чата"
 
 #, fuzzy
+msgid "text color for nicks (comma separated list of colors)"
+msgstr "цвет времени в окне чата"
+
+#, fuzzy
 msgid "text color for local nick in chat window"
 msgstr "текст, который отображать до ника в окне чата"
 
@@ -1937,46 +1938,6 @@ msgid "text color for other nick in private buffer"
 msgstr "цвет ника собеседника в окне привата"
 
 #, fuzzy
-msgid "text color #1 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #2 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #3 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #4 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #5 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #6 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #7 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #8 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #9 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
-msgid "text color #10 for nick"
-msgstr "цвет ника"
-
-#, fuzzy
 msgid "text color for hostnames"
 msgstr "цвет hostname"
 
@@ -2798,9 +2759,9 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
-msgstr ""
+#, fuzzy
+msgid "colors"
+msgstr "цвет чата"
 
 msgid "Available infos:"
 msgstr ""
@@ -6897,6 +6858,49 @@ msgstr ""
 msgid "Pointer"
 msgstr "минута"
 
+#~ msgid "number of colors to use for nicks colors"
+#~ msgstr "количество цветов для раскрашивания ников"
+
+#, fuzzy
+#~ msgid "text color #1 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #2 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #3 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #4 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #5 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #6 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #7 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #8 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #9 for nick"
+#~ msgstr "цвет ника"
+
+#, fuzzy
+#~ msgid "text color #10 for nick"
+#~ msgstr "цвет ника"
+
 #, fuzzy
 #~ msgid "[-server server] receiver[,receiver] text"
 #~ msgstr "адресат[,адресат] текст"
diff --git a/po/weechat.pot b/po/weechat.pot
index 1cf124a12..30b7743e8 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: 2010-12-20 09:52+0100\n"
+"POT-Creation-Date: 2010-12-20 12:52+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"
@@ -1399,9 +1399,6 @@ msgid ""
 "french time: \"${lightblue}%H${white}%M${lightred}%S\""
 msgstr ""
 
-msgid "number of colors to use for nicks colors"
-msgstr ""
-
 msgid ""
 "if set, uses real white color, disabled by default for terms with white "
 "background (if you never use white background, you should turn on this "
@@ -1638,40 +1635,13 @@ msgstr ""
 msgid "text color for nicks in chat window"
 msgstr ""
 
-msgid "text color for local nick in chat window"
+msgid "text color for nicks (comma separated list of colors)"
 msgstr ""
 
-msgid "text color for other nick in private buffer"
-msgstr ""
-
-msgid "text color #1 for nick"
-msgstr ""
-
-msgid "text color #2 for nick"
-msgstr ""
-
-msgid "text color #3 for nick"
-msgstr ""
-
-msgid "text color #4 for nick"
-msgstr ""
-
-msgid "text color #5 for nick"
-msgstr ""
-
-msgid "text color #6 for nick"
-msgstr ""
-
-msgid "text color #7 for nick"
-msgstr ""
-
-msgid "text color #8 for nick"
-msgstr ""
-
-msgid "text color #9 for nick"
+msgid "text color for local nick in chat window"
 msgstr ""
 
-msgid "text color #10 for nick"
+msgid "text color for other nick in private buffer"
 msgstr ""
 
 msgid "text color for hostnames"
@@ -2405,8 +2375,7 @@ msgstr ""
 msgid "%sdemo message with error prefix"
 msgstr ""
 
-#, c-format
-msgid "colors: %s buffer %s nick1 %s nick2 %s nick3 %s nick4"
+msgid "colors"
 msgstr ""
 
 msgid "Available infos:"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 719cf21dd..5efd720f6 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -78,7 +78,6 @@ struct t_config_option *config_startup_display_version;
 struct t_config_option *config_look_align_end_of_lines;
 struct t_config_option *config_look_buffer_notify_default;
 struct t_config_option *config_look_buffer_time_format;
-struct t_config_option *config_look_color_nicks_number;
 struct t_config_option *config_look_color_real_white;
 struct t_config_option *config_look_command_chars;
 struct t_config_option *config_look_confirm_quit;
@@ -138,9 +137,9 @@ struct t_config_option *config_color_chat_buffer;
 struct t_config_option *config_color_chat_server;
 struct t_config_option *config_color_chat_channel;
 struct t_config_option *config_color_chat_nick;
+struct t_config_option *config_color_chat_nick_colors;
 struct t_config_option *config_color_chat_nick_self;
 struct t_config_option *config_color_chat_nick_other;
-struct t_config_option *config_color_chat_nick_colors[GUI_COLOR_NICK_NUMBER];
 struct t_config_option *config_color_chat_host;
 struct t_config_option *config_color_chat_delimiters;
 struct t_config_option *config_color_chat_highlight;
@@ -1456,11 +1455,6 @@ config_weechat_init_options ()
            "\"${color}\", for example french time: "
            "\"${lightblue}%H${white}%M${lightred}%S\""),
         NULL, 0, 0, "%H:%M:%S", NULL, 0, NULL, NULL, &config_change_buffer_time_format, NULL, NULL, NULL);
-    config_look_color_nicks_number = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "color_nicks_number", "integer",
-        N_("number of colors to use for nicks colors"),
-        NULL, 1, 10, "10", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_color_real_white = config_file_new_option (
         weechat_config_file, ptr_section,
         "color_real_white", "boolean",
@@ -1869,6 +1863,13 @@ config_weechat_init_options ()
         N_("text color for nicks in chat window"),
         NULL, GUI_COLOR_CHAT_NICK, 0, "lightcyan", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
+    config_color_chat_nick_colors = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "chat_nick_colors", "string",
+        N_("text color for nicks (comma separated list of colors)"),
+        NULL, 0, 0, "cyan,magenta,green,brown,lightblue,default,lightcyan,"
+        "lightmagenta,lightgreen,blue", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL);
     config_color_chat_nick_self = config_file_new_option (
         weechat_config_file, ptr_section,
         "chat_nick_self", "color",
@@ -1881,66 +1882,6 @@ config_weechat_init_options ()
         N_("text color for other nick in private buffer"),
         NULL, GUI_COLOR_CHAT_NICK_OTHER, 0, "cyan", NULL, 0,
         NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[0] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color01", "color",
-        N_("text color #1 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK1, 0, "cyan", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[1] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color02", "color",
-        N_("text color #2 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK2, 0, "magenta", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[2] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color03", "color",
-        N_("text color #3 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK3, 0, "green", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[3] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color04", "color",
-        N_("text color #4 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK4, 0, "brown", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[4] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color05", "color",
-        N_("text color #5 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK5, 0, "lightblue", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[5] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color06", "color",
-        N_("text color #6 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK6, 0, "default", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[6] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color07", "color",
-        N_("text color #7 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK7, 0, "lightcyan", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[7] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color08", "color",
-        N_("text color #8 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK8, 0, "lightmagenta", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[8] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color09", "color",
-        N_("text color #9 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK9, 0, "lightgreen", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
-    config_color_chat_nick_colors[9] = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "chat_nick_color10", "color",
-        N_("text color #10 for nick"),
-        NULL, GUI_COLOR_CHAT_NICK10, 0, "blue", NULL, 0,
-        NULL, NULL, &config_change_color, NULL, NULL, NULL);
     config_color_chat_host = config_file_new_option (
         weechat_config_file, ptr_section,
         "chat_host", "color",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 659f0910f..94a053dab 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -109,7 +109,6 @@ extern struct t_config_option *config_look_buffer_notify_default;
 extern struct t_config_option *config_look_buffer_time_format;
 extern struct t_config_option *config_look_command_chars;
 extern struct t_config_option *config_look_confirm_quit;
-extern struct t_config_option *config_look_color_nicks_number;
 extern struct t_config_option *config_look_color_real_white;
 extern struct t_config_option *config_look_day_change;
 extern struct t_config_option *config_look_day_change_time_format;
@@ -165,9 +164,9 @@ extern struct t_config_option *config_color_chat_buffer;
 extern struct t_config_option *config_color_chat_server;
 extern struct t_config_option *config_color_chat_channel;
 extern struct t_config_option *config_color_chat_nick;
+extern struct t_config_option *config_color_chat_nick_colors;
 extern struct t_config_option *config_color_chat_nick_self;
 extern struct t_config_option *config_color_chat_nick_other;
-extern struct t_config_option *config_color_chat_nick_colors[];
 extern struct t_config_option *config_color_chat_host;
 extern struct t_config_option *config_color_chat_delimiters;
 extern struct t_config_option *config_color_chat_highlight;
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index fd66f6816..2f44518ef 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -225,6 +225,11 @@ gui_color_get_name (int num_color)
 void
 gui_color_build (int number, int foreground, int background)
 {
+    if (foreground < 0)
+        foreground = 0;
+    if (background < 0)
+        background = 0;
+    
     if (!gui_color[number])
     {
         gui_color[number] = malloc (sizeof (*gui_color[number]));
@@ -370,8 +375,6 @@ gui_color_init_pairs ()
 void
 gui_color_init_weechat ()
 {
-    int i;
-    
     gui_color_build (GUI_COLOR_SEPARATOR, CONFIG_COLOR(config_color_separator), CONFIG_COLOR(config_color_chat_bg));
     
     gui_color_build (GUI_COLOR_CHAT, CONFIG_COLOR(config_color_chat), CONFIG_COLOR(config_color_chat_bg));
@@ -390,10 +393,6 @@ gui_color_init_weechat ()
     gui_color_build (GUI_COLOR_CHAT_NICK, CONFIG_COLOR(config_color_chat_nick), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_NICK_SELF, CONFIG_COLOR(config_color_chat_nick_self), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_NICK_OTHER, CONFIG_COLOR(config_color_chat_nick_other), CONFIG_COLOR(config_color_chat_bg));
-    for (i = 0; i < GUI_COLOR_NICK_NUMBER; i++)
-    {
-        gui_color_build (GUI_COLOR_CHAT_NICK1 + i, CONFIG_COLOR(config_color_chat_nick_colors[i]), CONFIG_COLOR(config_color_chat_bg));
-    }
     gui_color_build (GUI_COLOR_CHAT_HOST, CONFIG_COLOR(config_color_chat_host), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_DELIMITERS, CONFIG_COLOR(config_color_chat_delimiters), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_HIGHLIGHT, CONFIG_COLOR(config_color_chat_highlight), CONFIG_COLOR(config_color_chat_highlight_bg));
@@ -401,6 +400,23 @@ gui_color_init_weechat ()
     gui_color_build (GUI_COLOR_CHAT_TEXT_FOUND, CONFIG_COLOR(config_color_chat_text_found), CONFIG_COLOR(config_color_chat_text_found_bg));
     gui_color_build (GUI_COLOR_CHAT_VALUE, CONFIG_COLOR(config_color_chat_value), CONFIG_COLOR(config_color_chat_bg));
     gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer), CONFIG_COLOR(config_color_chat_bg));
+    
+    /*
+     * define old nick colors for compatibility on /upgrade with previous
+     * versions: these colors have been removed in version 0.3.4 and replaced
+     * by new option "weechat.color.chat_nick_colors", which is a list of
+     * colors (without limit on number of colors)
+     */
+    gui_color_build (GUI_COLOR_CHAT_NICK1_OBSOLETE,  gui_color_search ("cyan"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK2_OBSOLETE,  gui_color_search ("magenta"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK3_OBSOLETE,  gui_color_search ("green"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK4_OBSOLETE,  gui_color_search ("brown"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK5_OBSOLETE,  gui_color_search ("lightblue"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK6_OBSOLETE,  gui_color_search ("default"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK7_OBSOLETE,  gui_color_search ("lightcyan"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK8_OBSOLETE,  gui_color_search ("lightmagenta"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK9_OBSOLETE,  gui_color_search ("lightgreen"), CONFIG_COLOR(config_color_chat_bg));
+    gui_color_build (GUI_COLOR_CHAT_NICK10_OBSOLETE, gui_color_search ("blue"), CONFIG_COLOR(config_color_chat_bg));
 }
 
 /*
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index a9262d782..853fcd79d 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -20,8 +20,6 @@
 #ifndef __WEECHAT_GUI_COLOR_H
 #define __WEECHAT_GUI_COLOR_H 1
 
-#define GUI_COLOR_NICK_NUMBER 10
-
 enum t_gui_color_enum
 {
     GUI_COLOR_SEPARATOR = 0,
@@ -42,16 +40,20 @@ enum t_gui_color_enum
     GUI_COLOR_CHAT_NICK,
     GUI_COLOR_CHAT_NICK_SELF,
     GUI_COLOR_CHAT_NICK_OTHER,
-    GUI_COLOR_CHAT_NICK1,
-    GUI_COLOR_CHAT_NICK2,
-    GUI_COLOR_CHAT_NICK3,
-    GUI_COLOR_CHAT_NICK4,
-    GUI_COLOR_CHAT_NICK5,
-    GUI_COLOR_CHAT_NICK6,
-    GUI_COLOR_CHAT_NICK7,
-    GUI_COLOR_CHAT_NICK8,
-    GUI_COLOR_CHAT_NICK9,
-    GUI_COLOR_CHAT_NICK10,
+    /*
+     * following obsolete colors are kept here for compatibility
+     * with WeeChat <= 0.3.3
+     */
+    GUI_COLOR_CHAT_NICK1_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK2_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK3_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK4_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK5_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK6_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK7_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK8_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK9_OBSOLETE,  /* not used any more since WeeChat 0.3.4 */
+    GUI_COLOR_CHAT_NICK10_OBSOLETE, /* not used any more since WeeChat 0.3.4 */
     GUI_COLOR_CHAT_HOST,
     GUI_COLOR_CHAT_DELIMITERS,
     GUI_COLOR_CHAT_HIGHLIGHT,
diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c
index c55ab8f85..27e2f29c5 100644
--- a/src/plugins/demo/demo.c
+++ b/src/plugins/demo/demo.c
@@ -68,13 +68,12 @@ demo_printf_command_cb (void *data, struct t_gui_buffer *buffer, int argc,
                         _("%sdemo message with error prefix"),
                         weechat_prefix ("error"));
         weechat_printf (buffer,
-                        _("colors: %s buffer %s nick1 %s nick2 %s nick3 "
-                          "%s nick4"),
+                        "%s: %s chat_buffer %s chat_server "
+                        "%s chat_host",
+                        _("colors"),
                         weechat_color ("chat_buffer"),
-                        weechat_color ("chat_nick_color1"),
-                        weechat_color ("chat_nick_color2"),
-                        weechat_color ("chat_nick_color3"),
-                        weechat_color ("chat_nick_color4"));
+                        weechat_color ("chat_server"),
+                        weechat_color ("chat_host"));
     }
     
     return WEECHAT_RC_OK;
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index 44e0e3cdc..3421c8de6 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -126,7 +126,9 @@ struct t_config_option *irc_config_network_send_unknown_commands;
 
 struct t_config_option *irc_config_server_default[IRC_SERVER_NUM_OPTIONS];
 
-struct t_hook *hook_config_color_nicks_number = NULL;
+struct t_hook *irc_config_hook_config_nick_colors = NULL;
+char **irc_config_nick_colors = NULL;
+int irc_config_num_nick_colors = 0;
 struct t_hashtable *irc_config_hashtable_nick_color_force = NULL;
 
 int irc_config_write_temp_servers = 0;
@@ -187,20 +189,41 @@ irc_config_compute_nick_colors ()
 }
 
 /*
- * irc_config_change_look_color_nicks_number: called when the
- *                                            "weechat.look.color_nicks_number"
- *                                            option is changed
+ * irc_config_set_nick_colors: set nick colors using option
+ *                             "weechat.color.chat_nick_colors"
+ */
+
+void
+irc_config_set_nick_colors ()
+{
+    if (irc_config_nick_colors)
+    {
+        weechat_string_free_split (irc_config_nick_colors);
+        irc_config_nick_colors = NULL;
+        irc_config_num_nick_colors = 0;
+    }
+    
+    irc_config_nick_colors =
+        weechat_string_split (weechat_config_string (weechat_config_get ("weechat.color.chat_nick_colors")),
+                              ",", 0, 0,
+                              &irc_config_num_nick_colors);
+}
+
+/*
+ * irc_config_change_nick_colors_cb: callback called when option
+ *                                   "weechat.color.chat_nick_colors" is changed
  */
 
 int
-irc_config_change_look_color_nicks_number (void *data, const char *option,
-                                           const char *value)
+irc_config_change_nick_colors_cb (void *data, const char *option,
+                                  const char *value)
 {
     /* make C compiler happy */
     (void) data;
     (void) option;
     (void) value;
     
+    irc_config_set_nick_colors ();
     irc_config_compute_nick_colors ();
     
     return WEECHAT_RC_OK;
@@ -2254,8 +2277,8 @@ irc_config_init ()
     }
     irc_config_section_server = ptr_section;
     
-    hook_config_color_nicks_number = weechat_hook_config ("weechat.look.color_nicks_number",
-                                                          &irc_config_change_look_color_nicks_number, NULL);
+    irc_config_hook_config_nick_colors = weechat_hook_config ("weechat.color.chat_nick_colors",
+                                                              &irc_config_change_nick_colors_cb, NULL);
     
     return 1;
 }
@@ -2299,13 +2322,19 @@ void
 irc_config_free ()
 {
     weechat_config_free (irc_config_file);
-
-    if (hook_config_color_nicks_number)
+    
+    if (irc_config_hook_config_nick_colors)
     {
-        weechat_unhook (hook_config_color_nicks_number);
-        hook_config_color_nicks_number = NULL;
+        weechat_unhook (irc_config_hook_config_nick_colors);
+        irc_config_hook_config_nick_colors = NULL;
     }
-
+    if (irc_config_nick_colors)
+    {
+        weechat_string_free_split (irc_config_nick_colors);
+        irc_config_nick_colors = NULL;
+        irc_config_num_nick_colors = 0;
+    }
+    
     if (irc_config_hashtable_nick_color_force)
     {
         weechat_hashtable_free (irc_config_hashtable_nick_color_force);
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index aed25367e..e199f4bcc 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -145,8 +145,12 @@ extern struct t_config_option *irc_config_network_send_unknown_commands;
 
 extern struct t_config_option *irc_config_server_default[];
 
+extern char **irc_config_nick_colors;
+extern int irc_config_num_nick_colors;
+
 extern struct t_hashtable *irc_config_hashtable_nick_color_force;
 
+extern void irc_config_set_nick_colors ();
 extern void irc_config_server_change_cb (void *data,
                                          struct t_config_option *option);
 struct t_config_option *irc_config_server_new_option (struct t_config_file *config_file,
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index 3d42afca1..f29eaf480 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -141,6 +141,12 @@ irc_nick_hash_color (const char *nickname)
     int color;
     const char *ptr_nick;
     
+    if (!irc_config_nick_colors)
+        irc_config_set_nick_colors ();
+    
+    if (irc_config_num_nick_colors == 0)
+        return 0;
+    
     color = 0;
     ptr_nick = nickname;
     while (ptr_nick && ptr_nick[0])
@@ -148,8 +154,8 @@ irc_nick_hash_color (const char *nickname)
         color += weechat_utf8_char_int (ptr_nick);
         ptr_nick = weechat_utf8_next_char (ptr_nick);
     }
-    return (color %
-            weechat_config_integer (weechat_config_get ("weechat.look.color_nicks_number")));
+    
+    return (color % irc_config_num_nick_colors);
 }
 
 /*
@@ -161,9 +167,15 @@ const char *
 irc_nick_find_color (const char *nickname)
 {
     int color;
-    char *nickname2, color_name[64];
+    char *nickname2;
     const char *forced_color;
     
+    if (!irc_config_nick_colors)
+        irc_config_set_nick_colors ();
+    
+    if (irc_config_num_nick_colors == 0)
+        return weechat_color ("default");
+    
     nickname2 = irc_nick_strdup_for_color (nickname);
     
     /* look if color is forced */
@@ -186,9 +198,7 @@ irc_nick_find_color (const char *nickname)
         free (nickname2);
     
     /* return color */
-    snprintf (color_name, sizeof (color_name),
-              "chat_nick_color%02d", color + 1);
-    return weechat_color (color_name);
+    return weechat_color (irc_config_nick_colors[color]);
 }
 
 /*
@@ -200,8 +210,15 @@ const char *
 irc_nick_find_color_name (const char *nickname)
 {
     int color;
-    char *nickname2, color_name[128];
+    char *nickname2;
     const char *forced_color;
+    static char *default_color = "default";
+    
+    if (!irc_config_nick_colors)
+        irc_config_set_nick_colors ();
+    
+    if (irc_config_num_nick_colors == 0)
+        return default_color;
     
     nickname2 = irc_nick_strdup_for_color (nickname);
     
@@ -221,9 +238,7 @@ irc_nick_find_color_name (const char *nickname)
         free (nickname2);
     
     /* return color name */
-    snprintf (color_name, sizeof (color_name),
-              "weechat.color.chat_nick_color%02d", color + 1);
-    return weechat_config_color (weechat_config_get (color_name));
+    return irc_config_nick_colors[color];
 }
 
 /*
diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h
index 8df1c66fa..54799fc7f 100644
--- a/src/plugins/irc/irc-nick.h
+++ b/src/plugins/irc/irc-nick.h
@@ -46,6 +46,8 @@ struct t_irc_nick
 extern int irc_nick_valid (struct t_irc_channel *channel,
                            struct t_irc_nick *nick);
 extern int irc_nick_is_nick (const char *string);
+extern int irc_nick_config_colors_cb (void *data, const char *option,
+                                      const char *value);
 extern const char *irc_nick_find_color (const char *nickname);
 extern const char *irc_nick_find_color_name (const char *nickname);
 extern int irc_nick_is_op (struct t_irc_server *server,