Reintroduce highlight (move code from irc plugin to core)

7 files changed, 834 insertions, 802 deletions

diff --git a/po/cs.po b/po/cs.po
index 469f43027..995ebecad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -946,21 +946,28 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "Změnil se den na %s\n"
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr "zobrazí WeeChat logo při spuštění"
 
 msgid "display WeeChat version at startup"
 msgstr "zobrazí verzi WeeChat při spuštění"
 
-msgid "command executed when WeeChat starts, before loading plugins"
-msgstr ""
-
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "WeeChat slogan (pokud je prázdné, není slogan použit)"
 
+#, fuzzy
+msgid "time format for buffers"
+msgstr "časová známka pro buffer"
+
+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 "
@@ -971,37 +978,87 @@ msgstr ""
 "byste toto nastavení zapnout, pro zobrazení skutečně bílé barvy místo "
 "výchozí barvy popředí terminálu)"
 
+msgid "display special message when day changes"
+msgstr "zobrazit speiální zprávy při změně dne"
+
 #, fuzzy
-msgid "save configuration file on exit"
-msgstr "uložit soubor s nastavením při ukončení"
+msgid "time format for date displayed when day changed"
+msgstr "časová známka pro zobrazení dne při změně dne"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
+msgstr ""
+"čárkou oddělený seznam slov pro zvýraznění (neporovnává se velikost písmen, "
+"slova mohou začínat nebo končit \"*\" pro částečnou schodu)"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "o kolik řádů posunou pomocí scroll_up a scroll_down"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
+"maximální počet jmen v hotlistu (0 = žádné jméno není zobrazeno, pouze čísla "
+"bufferů)"
 
-#, fuzzy
-msgid "time format for buffers"
-msgstr "časová známka pro buffer"
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr "maximální délka jmen v hotlistu (0 = bez limitu)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "počet barev použitých pro barvy přezdívek"
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
+"úroveň pro zobrazování jmen v hotlistu (kombinace: 1=připojení/odpojení "
+"2=zpráva, 4=soukromé, 8=zvýraznění, příklad: 12=soukromé+zvýraznění)"
 
-#, fuzzy
-msgid "display nicklist (on buffers with nicklist enabled)"
-msgstr "zobrazit okno se seznamem přezdívek (pouze pro okno kanálu)"
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
+"druh řazení hotlistu (group_time_asc [skupina_čas_vzestupně] (výchozí), "
+"group_time_desc [skupina_čas_sestupne], group_number_asc "
+"[skupina_číslo_vzestupně], group_number_desc [skupina_číslo_sestupně], "
+"number_asc [číslo_vzestupně], number_desc [číslo_sestupně] ) "
 
-msgid "nicklist position (top, left, right (default), bottom)"
-msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
+msgid "enable info bar"
+msgstr "povolit info bar"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat zvýrazněnou "
+"notifikaci v infobaru)"
+
+msgid "display seconds in infobar time"
+msgstr "zobrazit sekundy v čase v infobaru"
 
 #, fuzzy
+msgid "time format for time in infobar"
+msgstr "časová značka pro čas v infobaru"
+
+#, c-format
 msgid ""
-"min size for nicklist (width or height, depending on nicklist_position (0 = "
-"no min size))"
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
 msgstr ""
-"minimální velikost pro seznam přezdívek (šířka nebo výšhak, závisí na "
-"look_nicklist_position (0 = není minimální velikost))"
+"formát vstupního řádku ('%c' se přepíše na jeméno kanálu nebo serveru, '%n' "
+"se přepíše na přezdívku a '%m' na módy přezdívky"
+
+#, fuzzy
+msgid "time format for \"time\" bar item"
+msgstr "časová značka pro čas v infobaru"
+
+msgid "complete only with first nick found"
+msgstr "dokončit pouze s prvním nalezenou přezdívkou"
+
+msgid "chars ignored for nick completion"
+msgstr "znaky ignorovány pro doplňování přezdívky"
+
+#, fuzzy
+msgid "string inserted after nick completion"
+msgstr "řetězec vložený za doplňování přezdívky"
+
+#, fuzzy
+msgid "display nicklist (on buffers with nicklist enabled)"
+msgstr "zobrazit okno se seznamem přezdívek (pouze pro okno kanálu)"
 
 #, fuzzy
 msgid ""
@@ -1012,6 +1069,17 @@ msgstr ""
 "look_nicklist_position (0 = není maximální velikost; jestliže min = max a > "
 "0 pak je velikost fixní ))"
 
+#, fuzzy
+msgid ""
+"min size for nicklist (width or height, depending on nicklist_position (0 = "
+"no min size))"
+msgstr ""
+"minimální velikost pro seznam přezdívek (šířka nebo výšhak, závisí na "
+"look_nicklist_position (0 = není minimální velikost))"
+
+msgid "nicklist position (top, left, right (default), bottom)"
+msgstr "pozice seznamu přezdívek (top, left, right (výchozí), bottom)"
+
 msgid "separator between chat and nicklist"
 msgstr "oddělovač mezi rozhovorem a seznamem přezdívek"
 
@@ -1021,6 +1089,12 @@ msgstr "zobrazit mód přezdívky ((částečný)op/voice) před každou přezd�
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice"
 
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr ""
+"maximální počet řádků pro vložení bez dotazování uživatele (0 = vypnout tuto "
+"vlastnost)"
+
 #, fuzzy
 msgid "prefix for error messages"
 msgstr "vypsat debug zprávy"
@@ -1052,85 +1126,18 @@ msgid "string displayed after prefix"
 msgstr "řetězec vložený za doplňování přezdívky"
 
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "řetězec vložený za doplňování přezdívky"
-
-msgid "chars ignored for nick completion"
-msgstr "znaky ignorovány pro doplňování přezdívky"
-
-msgid "complete only with first nick found"
-msgstr "dokončit pouze s prvním nalezenou přezdívkou"
-
-msgid "enable info bar"
-msgstr "povolit info bar"
-
-#, fuzzy
-msgid "time format for time in infobar"
-msgstr "časová značka pro čas v infobaru"
-
-msgid "display seconds in infobar time"
-msgstr "zobrazit sekundy v čase v infobaru"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"podržet (v sekundách) zvýrazněnou zprávu v infobaru (0 = zakázat zvýrazněnou "
-"notifikaci v infobaru)"
-
-#, fuzzy
-msgid "time format for \"time\" bar item"
-msgstr "časová značka pro čas v infobaru"
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-"maximální počet jmen v hotlistu (0 = žádné jméno není zobrazeno, pouze čísla "
-"bufferů)"
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-"úroveň pro zobrazování jmen v hotlistu (kombinace: 1=připojení/odpojení "
-"2=zpráva, 4=soukromé, 8=zvýraznění, příklad: 12=soukromé+zvýraznění)"
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr "maximální délka jmen v hotlistu (0 = bez limitu)"
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-"druh řazení hotlistu (group_time_asc [skupina_čas_vzestupně] (výchozí), "
-"group_time_desc [skupina_čas_sestupne], group_number_asc "
-"[skupina_číslo_vzestupně], group_number_desc [skupina_číslo_sestupně], "
-"number_asc [číslo_vzestupně], number_desc [číslo_sestupně] ) "
-
-msgid "display special message when day changes"
-msgstr "zobrazit speiální zprávy při změně dne"
-
-#, fuzzy
-msgid "time format for date displayed when day changed"
-msgstr "časová známka pro zobrazení dne při změně dne"
-
-#, fuzzy
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr "použít značku na serveru/kanále pro zobrazení první nepřečtené řádky"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
-msgstr ""
-"formát vstupního řádku ('%c' se přepíše na jeméno kanálu nebo serveru, '%n' "
-"se přepíše na přezdívku a '%m' na módy přezdívky"
+#, fuzzy
+msgid "save configuration file on exit"
+msgstr "uložit soubor s nastavením při ukončení"
 
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
-msgstr ""
-"maximální počet řádků pro vložení bez dotazování uživatele (0 = vypnout tuto "
-"vlastnost)"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "o kolik řádů posunou pomocí scroll_up a scroll_down"
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
+msgstr "nastaví titulek okna (terminálu pro Cruses GUI) s jménem a verzí"
 
 #, fuzzy
 msgid "background color for window separators (when splited)"
@@ -1265,10 +1272,14 @@ msgid "text color for delimiters"
 msgstr "barva děličů v infobaru"
 
 #, fuzzy
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
 msgstr "barva pro zvýraznění přezdívky"
 
 #, fuzzy
+msgid "background color for highlighted prefix"
+msgstr "pozadí pro title bar"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "barva pro značku nepřečtených dat"
 
@@ -3052,6 +3063,11 @@ msgstr "chytré doplňování přezdívek (doplňovat posledně mluvící jako p
 msgid "display message when (un)marking as away"
 msgstr "zobrazit zprávu, když označen/odznačen jako nepřítomen"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+
 msgid "show remote away message only once in private"
 msgstr "zobrazit vzdálený zprávu o nepřítomnosti pouze jednou v soukromém okně"
 
@@ -3059,13 +3075,6 @@ msgid "display notices as private messages"
 msgstr "zobrazit upozornění jako soukromé zprávy"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"čárkou oddělený seznam slov pro zvýraznění (neporovnává se velikost písmen, "
-"slova mohou začínat nebo končit \"*\" pro částečnou schodu)"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr ""
@@ -3231,10 +3240,6 @@ msgstr "CTCP %sVERSION%s odpověď od %s%s%s: %s\n"
 msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "CTCP %sPING%s odpověď od %s%s%s: %ld.%ld sekund\n"
 
-#, c-format
-msgid "Private %s> %s"
-msgstr "Soukromý %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s opustil %s%s"
@@ -3251,10 +3256,6 @@ msgstr "CTCP %sVERSION%s obdržen od %s%s"
 msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "CTCP %sVERSION%s obdržen od %s%s"
 
-#, c-format
-msgid "Channel %s: * %s %s"
-msgstr "Kanál %s: %s %s"
-
 #, fuzzy, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "Obdržen CTCP %sZVUK%s \"%s\" od %s%s\n"
@@ -3271,10 +3272,6 @@ msgstr "Neznámý CTCP %s%s%s obdržen od %s%s"
 msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "Neznámý CTCP %s%s%s obdržen od %s%s"
 
-#, c-format
-msgid "Channel %s: %s> %s"
-msgstr "Kanál %s: %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s nemohu rozpársovat příkaz \"%s\"\n"
@@ -4569,6 +4566,19 @@ msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s chybí argument pro volbu \"%s\"\n"
 
 #, fuzzy
+#~ msgid "words to highlight in buffers"
+#~ msgstr "přesunout na další zvýraznění v bufferu"
+
+#~ msgid "Private %s> %s"
+#~ msgstr "Soukromý %s> %s"
+
+#~ msgid "Channel %s: * %s %s"
+#~ msgstr "Kanál %s: %s %s"
+
+#~ msgid "Channel %s: %s> %s"
+#~ msgstr "Kanál %s: %s> %s"
+
+#, fuzzy
 #~ msgid "%sError: command \"%s\" is running"
 #~ msgstr "%s příkaz \"%s\" selhal\n"
 
@@ -4828,9 +4838,6 @@ msgstr "%s chybí argument pro volbu \"%s\"\n"
 #~ msgid "scroll to previous highlight in buffer"
 #~ msgstr "přesunout na předchozí zvýraznění v bufferu"
 
-#~ msgid "scroll to next highlight in buffer"
-#~ msgstr "přesunout na další zvýraznění v bufferu"
-
 #~ msgid "refresh screen"
 #~ msgstr "obnov obrazovku"
 
diff --git a/po/de.po b/po/de.po
index 9c5fe225e..f78fd2509 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -943,21 +943,28 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "Ein neuer Tag bricht an, heute ist der %s\n"
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr "WeeChat-Logo beim Start anzeigen"
 
 msgid "display WeeChat version at startup"
 msgstr "WeeChat-Version beim Start anzeigen"
 
-msgid "command executed when WeeChat starts, before loading plugins"
-msgstr ""
-
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "WeeChat-Slogan (wenn leer, wird keiner benutzt)"
 
+#, fuzzy
+msgid "time format for buffers"
+msgstr "Timestamp für Puffer"
+
+msgid "number of colors to use for nicks colors"
+msgstr "Anzahl der für Nicknames zu benutzenden Farben"
+
 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 "
@@ -968,38 +975,83 @@ msgstr ""
 "Hintergrund benutzen, solltest du diese Option aktivieren um ein echtes Weiß "
 "anstelle der voreingestellten Terminal Vordergrundfarbe zu bekommen)"
 
+msgid "display special message when day changes"
+msgstr "spezielle Nachricht anzeigen, wenn ein neuer Tag beginnt"
+
 #, fuzzy
-msgid "save configuration file on exit"
-msgstr "Konfiguration beim Verlassen abspeichern"
+msgid "time format for date displayed when day changed"
+msgstr "Zeitstempel für das Datum, das beim Tageswechsel angezeigt wird"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
-"Fenstertitel setzen (oder Terminaltitel im Curses-GUI) mit Name und Version"
+"durch Kommata getrennte Liste der hervorzuhebenden Wörter (Groß-/"
+"Kleinschreibung wird nicht beachtet, die Wörter können mit \"*\" als Joker "
+"beginnen oder enden)"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "Anzahl der zu scrollenden Zeilen bei Bild-Hoch- und Bild-Runter-Taste"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
+"Maximale Anzahl an Namen in der Hotlist (0 = keine Namen, nur Puffernummern)"
 
-#, fuzzy
-msgid "time format for buffers"
-msgstr "Timestamp für Puffer"
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr "maximale Länge der Namen in der Hotlist (0: kein Limit)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "Anzahl der für Nicknames zu benutzenden Farben"
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
+"Level für Namensanzeige in der Hotlist (Kombination von: 1=join/part, "
+"2=Nachricht, 4=Query, 8=Highlight, z.B. 12=Query+Highlight)"
 
-#, fuzzy
-msgid "display nicklist (on buffers with nicklist enabled)"
-msgstr "Nicklisten-Fenster in Channelfenstern anzeigen"
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
 
-msgid "nicklist position (top, left, right (default), bottom)"
-msgstr "Nicklisten-Position (top, left, right (Standard), bottom)"
+msgid "enable info bar"
+msgstr "Infoleiste aktivieren"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"Anzeigezeit in Sekunden für Highlight-Messages in der Infobar (0: gar nicht "
+"erst anzeigen)"
+
+msgid "display seconds in infobar time"
+msgstr "Sekunden in der Infobar-Zeit anzeigen"
 
 #, fuzzy
+msgid "time format for time in infobar"
+msgstr "Timestamp in der Infobar"
+
+#, c-format
 msgid ""
-"min size for nicklist (width or height, depending on nicklist_position (0 = "
-"no min size))"
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
 msgstr ""
-"Minimale Größe der Nicklist (Breite oder Höhe, je nach "
-"look_nicklist_position (0: kein Minimum)"
+"Format der Eingabezeile ('%c' wird durch den Channel- oder Servernamen "
+"ersetzt, '%n' durch den Nicknamen und '%m' durch die Nick-Modi)"
+
+#, fuzzy
+msgid "time format for \"time\" bar item"
+msgstr "Timestamp in der Infobar"
+
+msgid "complete only with first nick found"
+msgstr "nur mit dem ersten, passenden Nicknamen vervollständigen"
+
+msgid "chars ignored for nick completion"
+msgstr "Zeichen, die bei der Nickvervollständigung ignoriert werden"
+
+#, fuzzy
+msgid "string inserted after nick completion"
+msgstr "Nach Nickvervollständigung anzufügende Zeichenfolge"
+
+#, fuzzy
+msgid "display nicklist (on buffers with nicklist enabled)"
+msgstr "Nicklisten-Fenster in Channelfenstern anzeigen"
 
 #, fuzzy
 msgid ""
@@ -1010,6 +1062,17 @@ msgstr ""
 "look_nicklist_position (0: kein Maximum); Wenn min == max > 0, ist die Größe "
 "fest."
 
+#, fuzzy
+msgid ""
+"min size for nicklist (width or height, depending on nicklist_position (0 = "
+"no min size))"
+msgstr ""
+"Minimale Größe der Nicklist (Breite oder Höhe, je nach "
+"look_nicklist_position (0: kein Minimum)"
+
+msgid "nicklist position (top, left, right (default), bottom)"
+msgstr "Nicklisten-Position (top, left, right (Standard), bottom)"
+
 msgid "separator between chat and nicklist"
 msgstr "Trennzeichen zwischen Chatfenster und Nickliste"
 
@@ -1020,6 +1083,11 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "Leerzeichen anzeigen wenn Nickmode nicht @%+ ist"
 
 #, fuzzy
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr "maximale Nick-Anzahl für Abwesenheitsüberprüfung"
+
+#, fuzzy
 msgid "prefix for error messages"
 msgstr "Debugging-Nachricht ausgeben"
 
@@ -1050,79 +1118,19 @@ msgid "string displayed after prefix"
 msgstr "Nach Nickvervollständigung anzufügende Zeichenfolge"
 
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "Nach Nickvervollständigung anzufügende Zeichenfolge"
-
-msgid "chars ignored for nick completion"
-msgstr "Zeichen, die bei der Nickvervollständigung ignoriert werden"
-
-msgid "complete only with first nick found"
-msgstr "nur mit dem ersten, passenden Nicknamen vervollständigen"
-
-msgid "enable info bar"
-msgstr "Infoleiste aktivieren"
-
-#, fuzzy
-msgid "time format for time in infobar"
-msgstr "Timestamp in der Infobar"
-
-msgid "display seconds in infobar time"
-msgstr "Sekunden in der Infobar-Zeit anzeigen"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"Anzeigezeit in Sekunden für Highlight-Messages in der Infobar (0: gar nicht "
-"erst anzeigen)"
-
-#, fuzzy
-msgid "time format for \"time\" bar item"
-msgstr "Timestamp in der Infobar"
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-"Maximale Anzahl an Namen in der Hotlist (0 = keine Namen, nur Puffernummern)"
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-"Level für Namensanzeige in der Hotlist (Kombination von: 1=join/part, "
-"2=Nachricht, 4=Query, 8=Highlight, z.B. 12=Query+Highlight)"
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr "maximale Länge der Namen in der Hotlist (0: kein Limit)"
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-
-msgid "display special message when day changes"
-msgstr "spezielle Nachricht anzeigen, wenn ein neuer Tag beginnt"
+msgid "use a marker (line or char) on buffers to show first unread line"
+msgstr "markiere die erste, ungelesene Zeile bei Server- und Channel-Puffern"
 
 #, fuzzy
-msgid "time format for date displayed when day changed"
-msgstr "Zeitstempel für das Datum, das beim Tageswechsel angezeigt wird"
+msgid "save configuration file on exit"
+msgstr "Konfiguration beim Verlassen abspeichern"
 
-#, fuzzy
-msgid "use a marker (line or char) on buffers to show first unread line"
-msgstr "markiere die erste, ungelesene Zeile bei Server- und Channel-Puffern"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "Anzahl der zu scrollenden Zeilen bei Bild-Hoch- und Bild-Runter-Taste"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
+msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
-"Format der Eingabezeile ('%c' wird durch den Channel- oder Servernamen "
-"ersetzt, '%n' durch den Nicknamen und '%m' durch die Nick-Modi)"
-
-#, fuzzy
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
-msgstr "maximale Nick-Anzahl für Abwesenheitsüberprüfung"
+"Fenstertitel setzen (oder Terminaltitel im Curses-GUI) mit Name und Version"
 
 #, fuzzy
 msgid "background color for window separators (when splited)"
@@ -1258,10 +1266,14 @@ msgid "text color for delimiters"
 msgstr "Farbe der Infobar-Trennzeichen"
 
 #, fuzzy
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
 msgstr "Farbe des hervorgehobenen Nicknames"
 
 #, fuzzy
+msgid "background color for highlighted prefix"
+msgstr "Hintergrundfarbe der Titelleiste"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "Farbe der Ungelesenenmarkierung"
 
@@ -3031,6 +3043,11 @@ msgstr ""
 msgid "display message when (un)marking as away"
 msgstr "bei Abwesenheit und Rückkehr eine Nachricht anzeigen"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+
 msgid "show remote away message only once in private"
 msgstr ""
 "in privaten Unterhaltungen nur einmalig eine Abwesenheitsnachricht anzeigen"
@@ -3039,14 +3056,6 @@ msgid "display notices as private messages"
 msgstr "NOTICEs als Queries anzeigen"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"durch Kommata getrennte Liste der hervorzuhebenden Wörter (Groß-/"
-"Kleinschreibung wird nicht beachtet, die Wörter können mit \"*\" als Joker "
-"beginnen oder enden)"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr ""
@@ -3212,10 +3221,6 @@ msgstr "CTCP %sVERSION%s Antwort von %s%s%s: %s\n"
 msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "CTCP %sPING%s Antwort von %s%s%s: %ld.%ld Sekunden\n"
 
-#, c-format
-msgid "Private %s> %s"
-msgstr "Privat %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s verlässt %s%s"
@@ -3232,10 +3237,6 @@ msgstr "CTCP %sVERSION%s von %s%s empfangen"
 msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "CTCP %sVERSION%s von %s%s empfangen"
 
-#, c-format
-msgid "Channel %s: * %s %s"
-msgstr "Channel %s: * %s %s"
-
 #, fuzzy, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "Ein CTCP %sSOUND%s \"%s\" wurde von %s%s empfangen\n"
@@ -3252,10 +3253,6 @@ msgstr "Unbekannter CTCP %s%s%s von %s%s empfangen"
 msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "Unbekannter CTCP %s%s%s von %s%s empfangen"
 
-#, c-format
-msgid "Channel %s: %s> %s"
-msgstr "Channel %s: %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s kann den \"%s\"-Befehl nicht parsen\n"
@@ -4559,6 +4556,19 @@ msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s fehlende Argumente für die \"--dir\"-Option\n"
 
 #, fuzzy
+#~ msgid "words to highlight in buffers"
+#~ msgstr "scrolle zur nächsten Hervorhebung im Puffer"
+
+#~ msgid "Private %s> %s"
+#~ msgstr "Privat %s> %s"
+
+#~ msgid "Channel %s: * %s %s"
+#~ msgstr "Channel %s: * %s %s"
+
+#~ msgid "Channel %s: %s> %s"
+#~ msgstr "Channel %s: %s> %s"
+
+#, fuzzy
 #~ msgid "%sError: command \"%s\" is running"
 #~ msgstr "%s der Befehl \"%s\" schlug fehl\n"
 
@@ -4820,9 +4830,6 @@ msgstr "%s fehlende Argumente für die \"--dir\"-Option\n"
 #~ msgid "scroll to previous highlight in buffer"
 #~ msgstr "scrolle zur vorherigen hervorhebung im Puffer"
 
-#~ msgid "scroll to next highlight in buffer"
-#~ msgstr "scrolle zur nächsten Hervorhebung im Puffer"
-
 #~ msgid "refresh screen"
 #~ msgstr "Bild neu aufbauen"
 
diff --git a/po/es.po b/po/es.po
index 8324f4627..1f2078992 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
 "PO-Revision-Date: 2007-09-19 12:09+0200\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -921,21 +921,28 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "Día cambiado a %s\n"
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr "mostrar el logotipo de WeeChat en el arranque"
 
 msgid "display WeeChat version at startup"
 msgstr "mostrar la versión de Weechat en el arranque"
 
-msgid "command executed when WeeChat starts, before loading plugins"
-msgstr ""
-
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "eslógan de WeeChat (si está vacío, el eslógan no será utilizado)"
 
+#, fuzzy
+msgid "time format for buffers"
+msgstr "fecha y hora para las búfers"
+
+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 "
@@ -946,33 +953,93 @@ msgstr ""
 "activar esta opción para ver el blanco verdadero en vez del color de primer "
 "plano del terminal por defecto)"
 
+msgid "display special message when day changes"
+msgstr "mostrar un mensaje especial cuando el día cambia"
+
 #, fuzzy
-msgid "save configuration file on exit"
-msgstr "guardar configuración a disco"
+msgid "time format for date displayed when day changed"
+msgstr "marca de tiempo para la fecha mostrada cuando el día cambió"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
-"define el título de la ventana (el terminal para la interfaz Curses) con el "
-"nombre y la versión"
+"lista separada por comas de palabras a resaltar (comparación insensible a "
+"mayúsculas, las palabras pueden empezar o terminar con \"*\" para una "
+"concordancia parcial)"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "cuántas líneas a desplazar con scroll_up and scroll_down"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
+"número máximo de nombres en la hotlist (0 = no se muestra ninguno, sólo "
+"los números de búfer)"
+
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr "longitud máxima de nombres en la hotlist (0 = sin límite)"
+
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
+"nivel para mostrar mensajes en la hotlist (combinación de: 1=join/part, "
+"2=mensaje, 4=privado, 8=resaltado, por ejemplo: 12=privado + resaltado)"
+
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
+
+msgid "enable info bar"
+msgstr "activa la barra de información"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"retraso (en segundos) para la notificación de mensajes en la barra de "
+"información (0 = desactivar las notificaciones en la barra de información)"
+
+msgid "display seconds in infobar time"
+msgstr "mostrar segundos en la hora de la barra de herramientas"
 
 #, fuzzy
-msgid "time format for buffers"
-msgstr "fecha y hora para las búfers"
+msgid "time format for time in infobar"
+msgstr "fecha y hora para las conversaciones guardadas"
 
-msgid "number of colors to use for nicks colors"
-msgstr "número de colores para usar en los colores de nombres de usuario"
+#, c-format
+msgid ""
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
+msgstr ""
+"formato para el prompt de entrada ('%c' es reemplazado por un canal o "
+"servidor, '%n' por un nick y '%m' por modos de nick)"
+
+#, fuzzy
+msgid "time format for \"time\" bar item"
+msgstr "fecha y hora para las conversaciones guardadas"
+
+msgid "complete only with first nick found"
+msgstr "completar únicamente con el primer nick encontrado"
+
+msgid "chars ignored for nick completion"
+msgstr "caracteres ignorados para el completado del nombre de usuario"
+
+#, fuzzy
+msgid "string inserted after nick completion"
+msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
 
 #, fuzzy
 msgid "display nicklist (on buffers with nicklist enabled)"
 msgstr "mostrar ventana de usuarios (para las ventanas de canal)"
 
-msgid "nicklist position (top, left, right (default), bottom)"
+#, fuzzy
+msgid ""
+"max size for nicklist (width or height, depending on nicklist_position (0 = "
+"no max size; if min = max and > 0, then size is fixed))"
 msgstr ""
-"posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
-"(right, por defecto), abajo (bottom))"
+"tamaño máximo para la ventana de usuarios (ancho o alto, dependiendo de "
+"look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, "
+"entonces se fija el tamaño))"
 
 #, fuzzy
 msgid ""
@@ -982,14 +1049,10 @@ msgstr ""
 "tamaño mínimo para la ventana de usuarios (ancho o alto, dependiendo de "
 "look_nicklist_position (0 = sin tamaño mínimo))"
 
-#, fuzzy
-msgid ""
-"max size for nicklist (width or height, depending on nicklist_position (0 = "
-"no max size; if min = max and > 0, then size is fixed))"
+msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
-"tamaño máximo para la ventana de usuarios (ancho o alto, dependiendo de "
-"look_nicklist_position (0 = sin tamaño máximo, si min == max y > 0, "
-"entonces se fija el tamaño))"
+"posición de la ventana de usuarios (arriba (top), izquierda (left), derecha "
+"(right, por defecto), abajo (bottom))"
 
 msgid "separator between chat and nicklist"
 msgstr ""
@@ -1001,6 +1064,11 @@ msgid "display space if nick mode is not (half)op/voice"
 msgstr "mostrar un espacio si el modo de usuario no es (half)op/voice"
 
 #, fuzzy
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr "número máximo de nicks para la comprobación de ausencia"
+
+#, fuzzy
 msgid "prefix for error messages"
 msgstr "imprime mensajes de depuración"
 
@@ -1033,82 +1101,22 @@ msgid "string displayed after prefix"
 msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
 
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
-
-msgid "chars ignored for nick completion"
-msgstr "caracteres ignorados para el completado del nombre de usuario"
-
-msgid "complete only with first nick found"
-msgstr "completar únicamente con el primer nick encontrado"
-
-msgid "enable info bar"
-msgstr "activa la barra de información"
-
-#, fuzzy
-msgid "time format for time in infobar"
-msgstr "fecha y hora para las conversaciones guardadas"
-
-msgid "display seconds in infobar time"
-msgstr "mostrar segundos en la hora de la barra de herramientas"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"retraso (en segundos) para la notificación de mensajes en la barra de "
-"información (0 = desactivar las notificaciones en la barra de información)"
-
-#, fuzzy
-msgid "time format for \"time\" bar item"
-msgstr "fecha y hora para las conversaciones guardadas"
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-"número máximo de nombres en la hotlist (0 = no se muestra ninguno, sólo "
-"los números de búfer)"
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-"nivel para mostrar mensajes en la hotlist (combinación de: 1=join/part, "
-"2=mensaje, 4=privado, 8=resaltado, por ejemplo: 12=privado + resaltado)"
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr "longitud máxima de nombres en la hotlist (0 = sin límite)"
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-
-msgid "display special message when day changes"
-msgstr "mostrar un mensaje especial cuando el día cambia"
-
-#, fuzzy
-msgid "time format for date displayed when day changed"
-msgstr "marca de tiempo para la fecha mostrada cuando el día cambió"
-
-#, fuzzy
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr ""
 "usar un marcador en los servidores/canales para mostrar la primera línea "
 "sin leer"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
-msgstr ""
-"formato para el prompt de entrada ('%c' es reemplazado por un canal o "
-"servidor, '%n' por un nick y '%m' por modos de nick)"
-
 #, fuzzy
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
-msgstr "número máximo de nicks para la comprobación de ausencia"
+msgid "save configuration file on exit"
+msgstr "guardar configuración a disco"
+
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "cuántas líneas a desplazar con scroll_up and scroll_down"
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
+msgstr ""
+"define el título de la ventana (el terminal para la interfaz Curses) con el "
+"nombre y la versión"
 
 #, fuzzy
 msgid "background color for window separators (when splited)"
@@ -1243,10 +1251,14 @@ msgid "text color for delimiters"
 msgstr "color para los delimitadores de la barra de información"
 
 #, fuzzy
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
 msgstr "color para el alias resaltado"
 
 #, fuzzy
+msgid "background color for highlighted prefix"
+msgstr "color de fondo para la barra de título"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "color para el marcador de datos sin leer"
 
@@ -3024,6 +3036,11 @@ msgstr ""
 msgid "display message when (un)marking as away"
 msgstr "mostrar mensaje cuando se marque/desmarque como ausente"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+
 msgid "show remote away message only once in private"
 msgstr ""
 "mostrar mensaje de ausencia remota únicamente una vez se está en privado"
@@ -3032,14 +3049,6 @@ msgid "display notices as private messages"
 msgstr "mostrar noticias como mensajes privados"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"lista separada por comas de palabras a resaltar (comparación insensible a "
-"mayúsculas, las palabras pueden empezar o terminar con \"*\" para una "
-"concordancia parcial)"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr ""
@@ -3207,10 +3216,6 @@ msgstr "CTCP %sVERSION%s respuesta de %s%s%s: %s\n"
 msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "CTCP %sPING%s respuesta de %s%s%s: %ld.%ld segundos\n"
 
-#, c-format
-msgid "Private %s> %s"
-msgstr "Privado %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s ha abandonado %s%s"
@@ -3228,10 +3233,6 @@ msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "CTCP %sVERSION%s recibido de %s%s"
 
 #, fuzzy, c-format
-msgid "Channel %s: * %s %s"
-msgstr "reop canal %s%s%s: %s%s\n"
-
-#, fuzzy, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "Recibido un CTCP %sSOUND%s \"%s\" de %s%s\n"
 
@@ -3248,10 +3249,6 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "CTCP desconocido %s%s%s recibido de %s%s"
 
 #, fuzzy, c-format
-msgid "Channel %s: %s> %s"
-msgstr "reop canal %s%s%s: %s%s\n"
-
-#, fuzzy, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s no es posible analizar el comando \"%s\"\n"
 
@@ -4567,6 +4564,21 @@ msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s falta un argumento para la opción --dir\n"
 
 #, fuzzy
+#~ msgid "words to highlight in buffers"
+#~ msgstr "desplazarse al resaltado siguiente en el búfer"
+
+#~ msgid "Private %s> %s"
+#~ msgstr "Privado %s> %s"
+
+#, fuzzy
+#~ msgid "Channel %s: * %s %s"
+#~ msgstr "reop canal %s%s%s: %s%s\n"
+
+#, fuzzy
+#~ msgid "Channel %s: %s> %s"
+#~ msgstr "reop canal %s%s%s: %s%s\n"
+
+#, fuzzy
 #~ msgid "%sError: command \"%s\" is running"
 #~ msgstr "%s el comando \"%s\" ha fallado\n"
 
@@ -4823,9 +4835,6 @@ msgstr "%s falta un argumento para la opción --dir\n"
 #~ msgid "scroll to previous highlight in buffer"
 #~ msgstr "desplazarse al resaltado anterior en el búfer"
 
-#~ msgid "scroll to next highlight in buffer"
-#~ msgstr "desplazarse al resaltado siguiente en el búfer"
-
 #~ msgid "refresh screen"
 #~ msgstr "recargar la pantalla"
 
diff --git a/po/fr.po b/po/fr.po
index 26cf56fb8..efbfd7393 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
-"PO-Revision-Date: 2008-05-22 13:00+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
+"PO-Revision-Date: 2008-06-01 22:03+0200\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -951,23 +951,29 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "\t\tJour changé: %s"
 
-msgid "display WeeChat logo at startup"
-msgstr "afficher le logo WeeChat au démarrage"
-
-msgid "display WeeChat version at startup"
-msgstr "afficher la version de WeeChat au démarrage"
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+"commande exécutée quand WeeChat démarre, après le chargement des extensions"
 
 msgid "command executed when WeeChat starts, before loading plugins"
 msgstr ""
 "commande exécutée quand WeeChat démarre, avant le chargement des extensions"
 
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-"commande exécutée quand WeeChat démarre, après le chargement des extensions"
+msgid "display WeeChat logo at startup"
+msgstr "afficher le logo WeeChat au démarrage"
+
+msgid "display WeeChat version at startup"
+msgstr "afficher la version de WeeChat au démarrage"
 
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "slogan WeeChat (si vide, le slogan ne sera pas utilisé)"
 
+msgid "time format for buffers"
+msgstr "format de date/heure pour les tampons"
+
+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 "
@@ -978,32 +984,93 @@ msgstr ""
 "devriez activer cette option pour voir du vrai blanc au lieu de la couleur "
 "d'avant plan par défaut du terminal)"
 
-msgid "save configuration file on exit"
-msgstr "sauvegarder la configuration en quittant"
+msgid "display special message when day changes"
+msgstr "affiche un message quand le jour change"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
+msgid "time format for date displayed when day changed"
+msgstr "format de date pour la date affichée quand le jour a changé"
+
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
-"définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
-"nom et la version"
+"liste des mots pour la notification (séparés par des virgules, la "
+"comparaison ne tient pas compte de la casse, les mots peuvent commencer ou "
+"se terminer par \"*\" pour une comparaison partielle)"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "nombre de lignes pour le défilement avec scroll_up et scroll_down"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
+"nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, "
+"seulement les numéros de tampons)"
 
-msgid "time format for buffers"
-msgstr "format de date/heure pour les tampons"
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr "nombre maximum des noms dans la liste d'activité (0 = pas de limite)"
 
-msgid "number of colors to use for nicks colors"
-msgstr "nombre de couleurs à utiliser pour les couleurs des pseudos"
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
+"niveau pour l'affichage des noms dans la liste d'activité (combinaison de: "
+"1=join/part, 2=message, 4=privé, 8=highlight, par exemple: 12=privé"
+"+highlight)"
+
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
+"type de tri pour la liste d'activité (group_time_asc (par défaut), "
+"group_time_desc, group_number_asc, group_number_desc, number_asc, "
+"number_desc)"
+
+msgid "enable info bar"
+msgstr "active la barre d'infos"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"délai (en secondes) pour la notification des messages dans la barre d'infos "
+"(0 = désactiver les notifications dans la barre d'infos)"
+
+msgid "display seconds in infobar time"
+msgstr "afficher les secondes pour l'heure dans la barre d'infos"
+
+msgid "time format for time in infobar"
+msgstr "format de date/heure dans la barre d'infos"
+
+#, c-format
+msgid ""
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
+msgstr ""
+"format pour l'invite de la zone de saisie ('%c' est remplacé par le canal ou "
+"serveur, '%n' par le pseudo et '%m' par les modes du pseudo)"
+
+msgid "time format for \"time\" bar item"
+msgstr "format de date/heure pour l'objet de barre \"time\""
+
+msgid "complete only with first nick found"
+msgstr "compléter seulement avec le premier pseudo trouvé"
+
+msgid "chars ignored for nick completion"
+msgstr "caractères à ignorer pour la complétion des pseudos"
+
+msgid "string inserted after nick completion"
+msgstr "chaîne affichée après la complétion des pseudos"
 
 msgid "display nicklist (on buffers with nicklist enabled)"
 msgstr ""
 "afficher la liste de pseudos (sur les tampons avec la liste de pseudos "
 "activée)"
 
-msgid "nicklist position (top, left, right (default), bottom)"
+msgid ""
+"max size for nicklist (width or height, depending on nicklist_position (0 = "
+"no max size; if min = max and > 0, then size is fixed))"
 msgstr ""
-"position de la fenêtre des pseudos (top (haut), left (gauche), right "
-"(droite, par défaut), bottom (bas)"
+"taille maximum pour la fenêtre des pseudos (largeur ou hauteur, selon "
+"nicklist_position (0 = pas de taille maximum; si min = max et > 0, alors la "
+"taille est fixe))"
 
 msgid ""
 "min size for nicklist (width or height, depending on nicklist_position (0 = "
@@ -1012,13 +1079,10 @@ msgstr ""
 "taille minimum pour la fenêtre des pseudos (largeur ou hauteur, selon "
 "nicklist_position (0 = pas de taille minimum))"
 
-msgid ""
-"max size for nicklist (width or height, depending on nicklist_position (0 = "
-"no max size; if min = max and > 0, then size is fixed))"
+msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
-"taille maximum pour la fenêtre des pseudos (largeur ou hauteur, selon "
-"nicklist_position (0 = pas de taille maximum; si min = max et > 0, alors la "
-"taille est fixe))"
+"position de la fenêtre des pseudos (top (haut), left (gauche), right "
+"(droite, par défaut), bottom (bas)"
 
 msgid "separator between chat and nicklist"
 msgstr "séparateur entre la discussion et la liste de pseudos"
@@ -1029,6 +1093,12 @@ msgstr "afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur"
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "afficher un espace si le mode du pseudo n'est pas (half)op/voice"
 
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr ""
+"nombre maximum de lignes pour la détection de collage sans demander à "
+"l'utilisateur (0 = désactiver cette fonctionnalité)"
+
 msgid "prefix for error messages"
 msgstr "préfixe pour les messages d'erreur"
 
@@ -1053,83 +1123,21 @@ msgstr "taille maximum pour le préfixe (0 = pas de taille maximum)"
 msgid "string displayed after prefix"
 msgstr "chaîne affichée après le préfixe"
 
-msgid "string inserted after nick completion"
-msgstr "chaîne affichée après la complétion des pseudos"
-
-msgid "chars ignored for nick completion"
-msgstr "caractères à ignorer pour la complétion des pseudos"
-
-msgid "complete only with first nick found"
-msgstr "compléter seulement avec le premier pseudo trouvé"
-
-msgid "enable info bar"
-msgstr "active la barre d'infos"
-
-msgid "time format for time in infobar"
-msgstr "format de date/heure dans la barre d'infos"
-
-msgid "display seconds in infobar time"
-msgstr "afficher les secondes pour l'heure dans la barre d'infos"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"délai (en secondes) pour la notification des messages dans la barre d'infos "
-"(0 = désactiver les notifications dans la barre d'infos)"
-
-msgid "time format for \"time\" bar item"
-msgstr "format de date/heure pour l'objet de barre \"time\""
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-"nombre maximum de noms dans la liste d'activité (0 = pas de nom affiché, "
-"seulement les numéros de tampons)"
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-"niveau pour l'affichage des noms dans la liste d'activité (combinaison de: "
-"1=join/part, 2=message, 4=privé, 8=highlight, par exemple: 12=privé"
-"+highlight)"
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr "nombre maximum des noms dans la liste d'activité (0 = pas de limite)"
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-"type de tri pour la liste d'activité (group_time_asc (par défaut), "
-"group_time_desc, group_number_asc, group_number_desc, number_asc, "
-"number_desc)"
-
-msgid "display special message when day changes"
-msgstr "affiche un message quand le jour change"
-
-msgid "time format for date displayed when day changed"
-msgstr "format de date pour la date affichée quand le jour a changé"
-
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr ""
 "utiliser un marqueur (ligne ou caractère) sur les tampons pour montrer la "
 "première ligne non lue"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
-msgstr ""
-"format pour l'invite de la zone de saisie ('%c' est remplacé par le canal ou "
-"serveur, '%n' par le pseudo et '%m' par les modes du pseudo)"
+msgid "save configuration file on exit"
+msgstr "sauvegarder la configuration en quittant"
 
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "nombre de lignes pour le défilement avec scroll_up et scroll_down"
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
-"nombre maximum de lignes pour la détection de collage sans demander à "
-"l'utilisateur (0 = désactiver cette fonctionnalité)"
+"définit le titre de la fenêtre (terminal pour l'interface Curses) avec le "
+"nom et la version"
 
 msgid "background color for window separators (when splited)"
 msgstr "couleur du fond pour les séparateurs de fenêtres (quand divisé)"
@@ -1230,8 +1238,11 @@ msgstr "couleur du texte pour les noms d'hôtes"
 msgid "text color for delimiters"
 msgstr "couleur du texte pour les délimiteurs"
 
-msgid "text color for highlighted nick"
-msgstr "couleur du texte pour le pseudo surligné"
+msgid "text color for highlighted prefix"
+msgstr "couleur du texte pour le préfixe surligné (highlight)"
+
+msgid "background color for highlighted prefix"
+msgstr "couleur du fond pour le préfixe surligné (highlight)"
 
 msgid "text color for unread data marker"
 msgstr "couleur du texte pour le marqueur de données non lues"
@@ -2979,6 +2990,14 @@ msgstr ""
 msgid "display message when (un)marking as away"
 msgstr "affiche un message pour l'absence/le retour"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+"liste des tags pour les messages qui peuvent produire un highlight (séparés "
+"par des virgules, typiquement tout message venant d'un autre utilisateur, "
+"pas les messages du serveur, ...)"
+
 msgid "show remote away message only once in private"
 msgstr "voir le message d'absence distant une seule fois en privé"
 
@@ -2986,14 +3005,6 @@ msgid "display notices as private messages"
 msgstr "afficher les notices comme des messages privés"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"liste des mots pour la notification (séparés par des virgules, la "
-"comparaison ne tient pas compte de la casse, les mots peuvent commencer ou "
-"se terminer par \"*\" pour une comparaison partielle)"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr ""
@@ -3158,10 +3169,6 @@ msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "%sCTCP %sPING%s réponse de %s%s%s: %ld.%ld %s"
 
 #, c-format
-msgid "Private %s> %s"
-msgstr "Privé %s> %s"
-
-#, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s%s %s(%s%s%s)%s a quitté %s%s %s(%s%s%s)"
 
@@ -3178,10 +3185,6 @@ msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "%sCTCP %sVERSION%s reçu de %s%s"
 
 #, c-format
-msgid "Channel %s: * %s %s"
-msgstr "Canal %s: * %s %s"
-
-#, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "%sCTCP %sSOUND%s \"%s\" reçu de %s%s"
 
@@ -3198,10 +3201,6 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "%sCTCP inconnu %s%s%s reçu de %s%s"
 
 #, c-format
-msgid "Channel %s: %s> %s"
-msgstr "Canal %s: %s> %s"
-
-#, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s%s: impossible d'analyser la commande \"%s\""
 
diff --git a/po/hu.po b/po/hu.po
index b0719a0c8..89df7d2b0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
 "PO-Revision-Date: 2007-10-10 18:07+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -953,21 +953,28 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "A mai dátum: %s\n"
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr "WeeChat logo mutatása induláskor"
 
 msgid "display WeeChat version at startup"
 msgstr "WeeChat verziójának mutatása induláskor"
 
-msgid "command executed when WeeChat starts, before loading plugins"
-msgstr ""
-
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "WeeChat szlogen (ha üres, akkor nem használja a program)"
 
+#, fuzzy
+msgid "time format for buffers"
+msgstr "a pufferek időbélyege"
+
+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 "
@@ -978,39 +985,79 @@ msgstr ""
 "hátteret, akkor bekapcsolhatja, hogy valódi fehéret kapjon a terminálban "
 "használt betűszín helyett)"
 
+msgid "display special message when day changes"
+msgstr "speciális üzenet az aktuális nap megváltozásakor"
+
 #, fuzzy
-msgid "save configuration file on exit"
-msgstr "beállítások mentése kilépéskor"
+msgid "time format for date displayed when day changed"
+msgstr "új nap kezdetével megjelenő időbélyeg"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
-"ablak címsorának beállítása (Curses GUI esetén a terminálé) a program nevére "
-"és verziójára"
+"kiemelendő szavak vesszővel elválasztott listája (kis/nagybetűtől független "
+"összehasonlítás, a szavak végére/elejére \"*\"-ot illesztve részleges keresés"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "a scroll_up és scroll_down hány sort görgessen"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
 
-#, fuzzy
-msgid "time format for buffers"
-msgstr "a pufferek időbélyege"
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr ""
 
-msgid "number of colors to use for nicks colors"
-msgstr "nevek színezéséhez használt színek száma"
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
 
-#, fuzzy
-msgid "display nicklist (on buffers with nicklist enabled)"
-msgstr "névlista ablak mutatása (szobaablakban)"
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
 
-msgid "nicklist position (top, left, right (default), bottom)"
-msgstr "névlista helye (top, left, right (alapértelmezett), bottom)"
+msgid "enable info bar"
+msgstr "információs pult engedélyezése"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"kihagyás (másodpercben) az üzenetek kiemelésére az információs pulton (0 = "
+"kiemelt üzenetek tiltása az információs pulton)"
+
+msgid "display seconds in infobar time"
+msgstr "másodpercek mutatása az információs pulton"
 
 #, fuzzy
+msgid "time format for time in infobar"
+msgstr "időbélyeg a információs pult idejéhez"
+
+#, c-format
 msgid ""
-"min size for nicklist (width or height, depending on nicklist_position (0 = "
-"no min size))"
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
 msgstr ""
-"névlista minimális mérete (szélesség vagy magasság a look_nicklist_position "
-"opciónak megfelelően (0 = nincs minimális érték))"
+"beviteli mező kinézete ('%c' helyére a szoba vagy a szerver, '%n' helyére a "
+"név és '%m' helyére a mód kerül)"
+
+#, fuzzy
+msgid "time format for \"time\" bar item"
+msgstr "időbélyeg a információs pult idejéhez"
+
+msgid "complete only with first nick found"
+msgstr "kiegészítés az első adandó névvel"
+
+msgid "chars ignored for nick completion"
+msgstr "névkiegészítéskor mellőzött karakterek"
+
+#, fuzzy
+msgid "string inserted after nick completion"
+msgstr "névkiegészítés után beszúrt szöveg"
+
+#, fuzzy
+msgid "display nicklist (on buffers with nicklist enabled)"
+msgstr "névlista ablak mutatása (szobaablakban)"
 
 #, fuzzy
 msgid ""
@@ -1021,6 +1068,17 @@ msgstr ""
 "opciónak megfelelően (0 = nincs maximális érték; ha min = max és > 0, akkor "
 "a méret fix))"
 
+#, fuzzy
+msgid ""
+"min size for nicklist (width or height, depending on nicklist_position (0 = "
+"no min size))"
+msgstr ""
+"névlista minimális mérete (szélesség vagy magasság a look_nicklist_position "
+"opciónak megfelelően (0 = nincs minimális érték))"
+
+msgid "nicklist position (top, left, right (default), bottom)"
+msgstr "névlista helye (top, left, right (alapértelmezett), bottom)"
+
 msgid "separator between chat and nicklist"
 msgstr "a névlista és a beszélgetőablak közti elválasztó"
 
@@ -1030,6 +1088,12 @@ msgstr "a felhasználó módjának ((fél)operátor/voice) mutatása a név elő
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice"
 
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr ""
+"maximálisan beilleszthető sorok száma a felhasználó megkérdezése nélkül (0 = "
+"szolgáltatás kikapcsolása)"
+
 #, fuzzy
 msgid "prefix for error messages"
 msgstr "hibakereső üzenetek megjelenítése"
@@ -1061,77 +1125,20 @@ msgid "string displayed after prefix"
 msgstr "névkiegészítés után beszúrt szöveg"
 
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "névkiegészítés után beszúrt szöveg"
-
-msgid "chars ignored for nick completion"
-msgstr "névkiegészítéskor mellőzött karakterek"
-
-msgid "complete only with first nick found"
-msgstr "kiegészítés az első adandó névvel"
-
-msgid "enable info bar"
-msgstr "információs pult engedélyezése"
-
-#, fuzzy
-msgid "time format for time in infobar"
-msgstr "időbélyeg a információs pult idejéhez"
-
-msgid "display seconds in infobar time"
-msgstr "másodpercek mutatása az információs pulton"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"kihagyás (másodpercben) az üzenetek kiemelésére az információs pulton (0 = "
-"kiemelt üzenetek tiltása az információs pulton)"
-
-#, fuzzy
-msgid "time format for \"time\" bar item"
-msgstr "időbélyeg a információs pult idejéhez"
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr ""
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-
-msgid "display special message when day changes"
-msgstr "speciális üzenet az aktuális nap megváltozásakor"
-
-#, fuzzy
-msgid "time format for date displayed when day changed"
-msgstr "új nap kezdetével megjelenő időbélyeg"
-
-#, fuzzy
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr "jelölje a szerveren/szobában utoljára olvasott sort"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
-msgstr ""
-"beviteli mező kinézete ('%c' helyére a szoba vagy a szerver, '%n' helyére a "
-"név és '%m' helyére a mód kerül)"
+#, fuzzy
+msgid "save configuration file on exit"
+msgstr "beállítások mentése kilépéskor"
 
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "a scroll_up és scroll_down hány sort görgessen"
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
-"maximálisan beilleszthető sorok száma a felhasználó megkérdezése nélkül (0 = "
-"szolgáltatás kikapcsolása)"
+"ablak címsorának beállítása (Curses GUI esetén a terminálé) a program nevére "
+"és verziójára"
 
 #, fuzzy
 msgid "background color for window separators (when splited)"
@@ -1266,10 +1273,14 @@ msgid "text color for delimiters"
 msgstr "információs pult határolóinak színe"
 
 #, fuzzy
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
 msgstr "kiemelt név színe"
 
 #, fuzzy
+msgid "background color for highlighted prefix"
+msgstr "címsor háttere"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "olvasatlan adat jelölő színe"
 
@@ -3059,6 +3070,11 @@ msgstr "okos névkiegészítés (először az utolsó partnerre egészít ki)"
 msgid "display message when (un)marking as away"
 msgstr "üzenet mutatása távollétkor/visszatéréskor"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+
 msgid "show remote away message only once in private"
 msgstr "privát beszélgetésben a másik fél távollétét csak egyszer jelezze"
 
@@ -3066,13 +3082,6 @@ msgid "display notices as private messages"
 msgstr "figyelmeztetések privát üzenetként való mutatása"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"kiemelendő szavak vesszővel elválasztott listája (kis/nagybetűtől független "
-"összehasonlítás, a szavak végére/elejére \"*\"-ot illesztve részleges keresés"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr ""
@@ -3232,10 +3241,6 @@ msgstr "CTCP %sVERSION%s válasz %s%s%s felhasználótól: %s\n"
 msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "CTCP %sPING%s válasz %s%s%s felhasználótól: %ld.%ld másodperc\n"
 
-#, c-format
-msgid "Private %s> %s"
-msgstr "Privát %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s elhagyta a(z) %s%s szobát"
@@ -3252,10 +3257,6 @@ msgstr "CTCP %sVERSION%s válasz innen: %s%s"
 msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "CTCP %sVERSION%s válasz innen: %s%s"
 
-#, c-format
-msgid "Channel %s: * %s %s"
-msgstr "%s szoba: * %s %s"
-
 #, fuzzy, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "CTCP %sSOUND%s (\"%s\") érkezett innen: %s%s\n"
@@ -3272,10 +3273,6 @@ msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
 msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
 
-#, c-format
-msgid "Channel %s: %s> %s"
-msgstr "%s szoba: %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
@@ -4573,6 +4570,19 @@ msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 
 #, fuzzy
+#~ msgid "words to highlight in buffers"
+#~ msgstr "ugrás a következő kiemelésre a pufferben"
+
+#~ msgid "Private %s> %s"
+#~ msgstr "Privát %s> %s"
+
+#~ msgid "Channel %s: * %s %s"
+#~ msgstr "%s szoba: * %s %s"
+
+#~ msgid "Channel %s: %s> %s"
+#~ msgstr "%s szoba: %s> %s"
+
+#, fuzzy
 #~ msgid "%sError: command \"%s\" is running"
 #~ msgstr "%s a \"%s\" parancs végrehajtása sikertelen\n"
 
@@ -4833,9 +4843,6 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
 #~ msgid "scroll to previous highlight in buffer"
 #~ msgstr "ugrás az előző kiemelésre a pufferben"
 
-#~ msgid "scroll to next highlight in buffer"
-#~ msgstr "ugrás a következő kiemelésre a pufferben"
-
 #~ msgid "refresh screen"
 #~ msgstr "képernyő frissítése"
 
diff --git a/po/ru.po b/po/ru.po
index e0d66d589..a3ea5b3ea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -950,21 +950,28 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr "Дата сменилась на %s\n"
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr "отображать логотип WeeChat при запуске"
 
 msgid "display WeeChat version at startup"
 msgstr "отображать версию WeeChat при запуске"
 
-msgid "command executed when WeeChat starts, before loading plugins"
-msgstr ""
-
-msgid "command executed when WeeChat starts, after loading plugins"
-msgstr ""
-
 msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr "слоган WeeChat (если пусто - используется слоган по умолчанию)"
 
+#, fuzzy
+msgid "time format for buffers"
+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 "
@@ -975,32 +982,94 @@ msgstr ""
 "белым фоном вам следует включить этот параметр чтобы видеть настоящий белый "
 "цвет вместо цвета терминала по умолчанию)"
 
+msgid "display special message when day changes"
+msgstr "отображать специальное сообщение  при смене дня"
+
 #, fuzzy
-msgid "save configuration file on exit"
-msgstr "сохранять конфигурационный файл при выходе"
+msgid "time format for date displayed when day changed"
+msgstr "отображение маркера даты при смене дня"
 
-msgid "set title for window (terminal for Curses GUI) with name and version"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
-"устанавливать заголовок окна (терминала при интерфейсе Curses) с именем и "
-"версией"
+"разделённый запятыми список подсвечиваемых слов (регистр учитывается, слова "
+"могут начинаться или кончаться \"*\" для неполного соответствия)"
 
-msgid "how many lines to scroll by with scroll_up and scroll_down"
-msgstr "количество проматываемых кнопками PageUp и PageDown строк"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgstr ""
+"максимальное количество имён в хотлисте (0 = имена не показываются, только "
+"номера буферов)"
+
+msgid "max length of names in hotlist (0 = no limit)"
+msgstr "максимальная длина имён в хотлисте (0=не ограничено)"
+
+msgid ""
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgstr ""
+"уровень отображения имён в хотлисте (сочетание: 1=вход/выход, 2=сообщение, "
+"4=личное сообщение, 8=подсветка, например: 12=личные+подсветка)"
+
+msgid ""
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgstr ""
+"тип сортировки хотлиста (group_time_asc (по-умолчанию), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
+
+msgid "enable info bar"
+msgstr "включить информационную панель"
+
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
+msgstr ""
+"задержка (в секундах) отображения сообщений в информационной строке (0 = "
+"отключить уведомления в информационной строке)"
+
+msgid "display seconds in infobar time"
+msgstr "показывать секунды в часах информационной панели"
 
 #, fuzzy
-msgid "time format for buffers"
-msgstr "время в буферах"
+msgid "time format for time in infobar"
+msgstr "время в информационной строке"
 
-msgid "number of colors to use for nicks colors"
-msgstr "количество цветов для раскрашивания ников"
+#, c-format
+msgid ""
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
+msgstr ""
+"формат приглашения ввода ('%c' заменяется на сервер или канал, '%n' на ник, "
+"а '%m' - на режимы ника"
+
+#, fuzzy
+msgid "time format for \"time\" bar item"
+msgstr "время в информационной строке"
+
+msgid "complete only with first nick found"
+msgstr "дополнять только первым найденным ником"
+
+msgid "chars ignored for nick completion"
+msgstr "символы, игнорируемые при автодополнении ника"
+
+#, fuzzy
+msgid "string inserted after nick completion"
+msgstr "строка, вставляемая после автодополнения ника"
 
 #, fuzzy
 msgid "display nicklist (on buffers with nicklist enabled)"
 msgstr "показывать список ников (в окнах каналов)"
 
-msgid "nicklist position (top, left, right (default), bottom)"
+#, fuzzy
+msgid ""
+"max size for nicklist (width or height, depending on nicklist_position (0 = "
+"no max size; if min = max and > 0, then size is fixed))"
 msgstr ""
-"расположение списка пользователей (top, left, right(по умолчанию), bottom)"
+"максимальный размер списка пользователей (высота или ширина, в зависимости "
+"от look_nicklist_position (0 = без максимального размера; если min = max и > "
+"0, то размер фиксированный))"
 
 #, fuzzy
 msgid ""
@@ -1010,14 +1079,9 @@ msgstr ""
 "минимальный размер списка пользователей (высота или ширина, в зависимости от "
 "look_nicklist_position (0 = без минимального размера))"
 
-#, fuzzy
-msgid ""
-"max size for nicklist (width or height, depending on nicklist_position (0 = "
-"no max size; if min = max and > 0, then size is fixed))"
+msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
-"максимальный размер списка пользователей (высота или ширина, в зависимости "
-"от look_nicklist_position (0 = без максимального размера; если min = max и > "
-"0, то размер фиксированный))"
+"расположение списка пользователей (top, left, right(по умолчанию), bottom)"
 
 msgid "separator between chat and nicklist"
 msgstr "разделитель чата и никлиста"
@@ -1028,6 +1092,12 @@ msgstr "отображать режим ника (op/voice) перед кажд�
 msgid "display space if nick mode is not (half)op/voice"
 msgstr "оставлять пробел, если ник не op/voice"
 
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
+msgstr ""
+"максимальное количество строк, вставляемых без подтверждения (0 = отключить "
+"подтверждение)"
+
 #, fuzzy
 msgid "prefix for error messages"
 msgstr "выводить отладочные сообщения"
@@ -1060,83 +1130,20 @@ msgid "string displayed after prefix"
 msgstr "строка, вставляемая после автодополнения ника"
 
 #, fuzzy
-msgid "string inserted after nick completion"
-msgstr "строка, вставляемая после автодополнения ника"
-
-msgid "chars ignored for nick completion"
-msgstr "символы, игнорируемые при автодополнении ника"
-
-msgid "complete only with first nick found"
-msgstr "дополнять только первым найденным ником"
-
-msgid "enable info bar"
-msgstr "включить информационную панель"
-
-#, fuzzy
-msgid "time format for time in infobar"
-msgstr "время в информационной строке"
-
-msgid "display seconds in infobar time"
-msgstr "показывать секунды в часах информационной панели"
-
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
-msgstr ""
-"задержка (в секундах) отображения сообщений в информационной строке (0 = "
-"отключить уведомления в информационной строке)"
-
-#, fuzzy
-msgid "time format for \"time\" bar item"
-msgstr "время в информационной строке"
-
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
-msgstr ""
-"максимальное количество имён в хотлисте (0 = имена не показываются, только "
-"номера буферов)"
-
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
-msgstr ""
-"уровень отображения имён в хотлисте (сочетание: 1=вход/выход, 2=сообщение, "
-"4=личное сообщение, 8=подсветка, например: 12=личные+подсветка)"
-
-msgid "max length of names in hotlist (0 = no limit)"
-msgstr "максимальная длина имён в хотлисте (0=не ограничено)"
-
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-msgstr ""
-"тип сортировки хотлиста (group_time_asc (по-умолчанию), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
-
-msgid "display special message when day changes"
-msgstr "отображать специальное сообщение  при смене дня"
-
-#, fuzzy
-msgid "time format for date displayed when day changed"
-msgstr "отображение маркера даты при смене дня"
-
-#, fuzzy
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr "использовать маркер непрочитанных сообщений в окнах серверов и каналов"
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
-msgstr ""
-"формат приглашения ввода ('%c' заменяется на сервер или канал, '%n' на ник, "
-"а '%m' - на режимы ника"
+#, fuzzy
+msgid "save configuration file on exit"
+msgstr "сохранять конфигурационный файл при выходе"
 
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr "количество проматываемых кнопками PageUp и PageDown строк"
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
-"максимальное количество строк, вставляемых без подтверждения (0 = отключить "
-"подтверждение)"
+"устанавливать заголовок окна (терминала при интерфейсе Curses) с именем и "
+"версией"
 
 #, fuzzy
 msgid "background color for window separators (when splited)"
@@ -1271,10 +1278,14 @@ msgid "text color for delimiters"
 msgstr "цвет разделителей информационной панели"
 
 #, fuzzy
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
 msgstr "цвет подсвечиваемого ника"
 
 #, fuzzy
+msgid "background color for highlighted prefix"
+msgstr "цвет фона заголовка"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "цвет маркера непрочитанных сообщений"
 
@@ -3055,6 +3066,11 @@ msgstr "умное дополнение ников (начинает переб�
 msgid "display message when (un)marking as away"
 msgstr "показывать сообщение во все каналы при установке/снятии отсутствия"
 
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
+msgstr ""
+
 msgid "show remote away message only once in private"
 msgstr "отображать уведомление об отсутствии единожды в привате"
 
@@ -3062,13 +3078,6 @@ msgid "display notices as private messages"
 msgstr "отображать notice'ы в виде личных сообщений"
 
 msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
-msgstr ""
-"разделённый запятыми список подсвечиваемых слов (регистр учитывается, слова "
-"могут начинаться или кончаться \"*\" для неполного соответствия)"
-
-msgid ""
 "default part message (leaving channel) ('%v' will be replaced by WeeChat "
 "version in string)"
 msgstr "сообщение покидания канала ('%v' будет заменён на версию WeeChat)"
@@ -3228,10 +3237,6 @@ msgstr "Ответ на CTCP %sVERSION%s от %s%s%s: %s\n"
 msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr "Ответ на %sPING%s от %s%s%s: %ld.%ld секунд\n"
 
-#, c-format
-msgid "Private %s> %s"
-msgstr "Личное %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr "%s%s %s(%s%s%s)%s покинул %s%s"
@@ -3248,10 +3253,6 @@ msgstr "Получен CTCP %sVERSION%s от %s%s"
 msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr "Получен CTCP %sVERSION%s от %s%s"
 
-#, c-format
-msgid "Channel %s: * %s %s"
-msgstr "Канал %s: * %s %s"
-
 #, fuzzy, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr "Получен CTCP %sSOUND%s \"%s\" от %s%s\n"
@@ -3268,10 +3269,6 @@ msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
 msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
 
-#, c-format
-msgid "Channel %s: %s> %s"
-msgstr "Канал %s: %s> %s"
-
 #, fuzzy, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr "%s не могу проанализировать команду \"%s\"\n"
@@ -4558,6 +4555,19 @@ msgid "%s%s: timeout for \"%s\" with %s"
 msgstr "%s нет аргумента для параметра \"%s\"\n"
 
 #, fuzzy
+#~ msgid "words to highlight in buffers"
+#~ msgstr "промотать буфер до следующей подсветки"
+
+#~ msgid "Private %s> %s"
+#~ msgstr "Личное %s> %s"
+
+#~ msgid "Channel %s: * %s %s"
+#~ msgstr "Канал %s: * %s %s"
+
+#~ msgid "Channel %s: %s> %s"
+#~ msgstr "Канал %s: %s> %s"
+
+#, fuzzy
 #~ msgid "%sError: command \"%s\" is running"
 #~ msgstr "%s команда \"%s\" не удалась\n"
 
@@ -4818,9 +4828,6 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
 #~ msgid "scroll to previous highlight in buffer"
 #~ msgstr "промотать буфер до предыдущей подсветки"
 
-#~ msgid "scroll to next highlight in buffer"
-#~ msgstr "промотать буфер до следующей подсветки"
-
 #~ msgid "refresh screen"
 #~ msgstr "обновить экран"
 
diff --git a/po/weechat.pot b/po/weechat.pot
index c5e0ca833..c473e4460 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: 2008-05-22 12:59+0200\n"
+"POT-Creation-Date: 2008-06-01 22:03+0200\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"
@@ -787,19 +787,25 @@ msgstr ""
 msgid "\t\tDay changed to %s"
 msgstr ""
 
+msgid "command executed when WeeChat starts, after loading plugins"
+msgstr ""
+
+msgid "command executed when WeeChat starts, before loading plugins"
+msgstr ""
+
 msgid "display WeeChat logo at startup"
 msgstr ""
 
 msgid "display WeeChat version at startup"
 msgstr ""
 
-msgid "command executed when WeeChat starts, before loading plugins"
+msgid "WeeChat slogan (if empty, slogan is not used)"
 msgstr ""
 
-msgid "command executed when WeeChat starts, after loading plugins"
+msgid "time format for buffers"
 msgstr ""
 
-msgid "WeeChat slogan (if empty, slogan is not used)"
+msgid "number of colors to use for nicks colors"
 msgstr ""
 
 msgid ""
@@ -808,130 +814,129 @@ msgid ""
 "option to see real white instead of default term foreground color)"
 msgstr ""
 
-msgid "save configuration file on exit"
-msgstr ""
-
-msgid "set title for window (terminal for Curses GUI) with name and version"
-msgstr ""
-
-msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgid "display special message when day changes"
 msgstr ""
 
-msgid "time format for buffers"
+msgid "time format for date displayed when day changed"
 msgstr ""
 
-msgid "number of colors to use for nicks colors"
+msgid ""
+"comma separated list of words to highlight (case insensitive comparison, "
+"words may begin or end with \"*\" for partial match)"
 msgstr ""
 
-msgid "display nicklist (on buffers with nicklist enabled)"
+msgid ""
+"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
 msgstr ""
 
-msgid "nicklist position (top, left, right (default), bottom)"
+msgid "max length of names in hotlist (0 = no limit)"
 msgstr ""
 
 msgid ""
-"min size for nicklist (width or height, depending on nicklist_position (0 = "
-"no min size))"
+"level for displaying names in hotlist (combination of: 1=join/part, "
+"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
 msgstr ""
 
 msgid ""
-"max size for nicklist (width or height, depending on nicklist_position (0 = "
-"no max size; if min = max and > 0, then size is fixed))"
+"hotlist sort type (group_time_asc (default), group_time_desc, "
+"group_number_asc, group_number_desc, number_asc, number_desc)"
 msgstr ""
 
-msgid "separator between chat and nicklist"
+msgid "enable info bar"
 msgstr ""
 
-msgid "display nick mode ((half)op/voice) before each nick"
+msgid ""
+"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
+"notifications in infobar)"
 msgstr ""
 
-msgid "display space if nick mode is not (half)op/voice"
+msgid "display seconds in infobar time"
 msgstr ""
 
-msgid "prefix for error messages"
+msgid "time format for time in infobar"
 msgstr ""
 
-msgid "prefix for network messages"
+#, c-format
+msgid ""
+"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
+"and '%m' by nick modes)"
 msgstr ""
 
-msgid "prefix for action messages"
+msgid "time format for \"time\" bar item"
 msgstr ""
 
-msgid "prefix for join messages"
+msgid "complete only with first nick found"
 msgstr ""
 
-msgid "prefix for quit messages"
+msgid "chars ignored for nick completion"
 msgstr ""
 
-msgid "prefix alignment (none, left, right (default))"
+msgid "string inserted after nick completion"
 msgstr ""
 
-msgid "max size for prefix (0 = no max size)"
+msgid "display nicklist (on buffers with nicklist enabled)"
 msgstr ""
 
-msgid "string displayed after prefix"
+msgid ""
+"max size for nicklist (width or height, depending on nicklist_position (0 = "
+"no max size; if min = max and > 0, then size is fixed))"
 msgstr ""
 
-msgid "string inserted after nick completion"
+msgid ""
+"min size for nicklist (width or height, depending on nicklist_position (0 = "
+"no min size))"
 msgstr ""
 
-msgid "chars ignored for nick completion"
+msgid "nicklist position (top, left, right (default), bottom)"
 msgstr ""
 
-msgid "complete only with first nick found"
+msgid "separator between chat and nicklist"
 msgstr ""
 
-msgid "enable info bar"
+msgid "display nick mode ((half)op/voice) before each nick"
 msgstr ""
 
-msgid "time format for time in infobar"
+msgid "display space if nick mode is not (half)op/voice"
 msgstr ""
 
-msgid "display seconds in infobar time"
+msgid ""
+"max number of lines for paste without asking user (0 = disable this feature)"
 msgstr ""
 
-msgid ""
-"delay (in seconds) for highlight messages in infobar (0 = disable highlight "
-"notifications in infobar)"
+msgid "prefix for error messages"
 msgstr ""
 
-msgid "time format for \"time\" bar item"
+msgid "prefix for network messages"
 msgstr ""
 
-msgid ""
-"max number of names in hotlist (0 = no name displayed, only buffer numbers)"
+msgid "prefix for action messages"
 msgstr ""
 
-msgid ""
-"level for displaying names in hotlist (combination of: 1=join/part, "
-"2=message, 4=private, 8=highlight, for example: 12=private+highlight)"
+msgid "prefix for join messages"
 msgstr ""
 
-msgid "max length of names in hotlist (0 = no limit)"
+msgid "prefix for quit messages"
 msgstr ""
 
-msgid ""
-"hotlist sort type (group_time_asc (default), group_time_desc, "
-"group_number_asc, group_number_desc, number_asc, number_desc)"
+msgid "prefix alignment (none, left, right (default))"
 msgstr ""
 
-msgid "display special message when day changes"
+msgid "max size for prefix (0 = no max size)"
 msgstr ""
 
-msgid "time format for date displayed when day changed"
+msgid "string displayed after prefix"
 msgstr ""
 
 msgid "use a marker (line or char) on buffers to show first unread line"
 msgstr ""
 
-#, c-format
-msgid ""
-"format for input prompt ('%c' is replaced by channel or server, '%n' by nick "
-"and '%m' by nick modes)"
+msgid "save configuration file on exit"
 msgstr ""
 
-msgid ""
-"max number of lines for paste without asking user (0 = disable this feature)"
+msgid "how many lines to scroll by with scroll_up and scroll_down"
+msgstr ""
+
+msgid "set title for window (terminal for Curses GUI) with name and version"
 msgstr ""
 
 msgid "background color for window separators (when splited)"
@@ -1033,7 +1038,10 @@ msgstr ""
 msgid "text color for delimiters"
 msgstr ""
 
-msgid "text color for highlighted nick"
+msgid "text color for highlighted prefix"
+msgstr ""
+
+msgid "background color for highlighted prefix"
 msgstr ""
 
 msgid "text color for unread data marker"
@@ -2537,15 +2545,15 @@ msgstr ""
 msgid "display message when (un)marking as away"
 msgstr ""
 
-msgid "show remote away message only once in private"
+msgid ""
+"comma separated list of tags for messages that may produce highlight "
+"(usually any message from another user, not server messages,..)"
 msgstr ""
 
-msgid "display notices as private messages"
+msgid "show remote away message only once in private"
 msgstr ""
 
-msgid ""
-"comma separated list of words to highlight (case insensitive comparison, "
-"words may begin or end with \"*\" for partial match)"
+msgid "display notices as private messages"
 msgstr ""
 
 msgid ""
@@ -2698,10 +2706,6 @@ msgid "%sCTCP %sPING%s reply from %s%s%s: %ld.%ld %s"
 msgstr ""
 
 #, c-format
-msgid "Private %s> %s"
-msgstr ""
-
-#, c-format
 msgid "%s%s%s %s(%s%s%s)%s has left %s%s %s(%s%s%s)"
 msgstr ""
 
@@ -2718,10 +2722,6 @@ msgid "%sCTCP %sVERSION%s received from %s%s"
 msgstr ""
 
 #, c-format
-msgid "Channel %s: * %s %s"
-msgstr ""
-
-#, c-format
 msgid "%sReceived a CTCP %sSOUND%s \"%s\" from %s%s"
 msgstr ""
 
@@ -2738,10 +2738,6 @@ msgid "%sUnknown CTCP %s%s%s received from %s%s"
 msgstr ""
 
 #, c-format
-msgid "Channel %s: %s> %s"
-msgstr ""
-
-#, c-format
 msgid "%s%s: cannot parse \"%s\" command"
 msgstr ""