summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--NEWS37
-rw-r--r--doc/de/autogen/user/weechat_options.txt12
-rw-r--r--doc/en/autogen/user/weechat_options.txt12
-rw-r--r--doc/fr/autogen/user/logger_options.txt4
-rw-r--r--doc/fr/autogen/user/weechat_options.txt18
-rw-r--r--doc/it/autogen/user/weechat_options.txt12
-rw-r--r--doc/ja/autogen/user/weechat_options.txt12
-rw-r--r--po/cs.po44
-rw-r--r--po/de.po10
-rw-r--r--po/es.po46
-rw-r--r--po/fr.po56
-rw-r--r--po/hu.po41
-rw-r--r--po/it.po50
-rw-r--r--po/ja.po50
-rw-r--r--po/pl.po47
-rw-r--r--po/pt_BR.po50
-rw-r--r--po/ru.po44
-rw-r--r--po/weechat.pot38
-rw-r--r--src/core/wee-config.c20
-rw-r--r--src/core/wee-config.h2
-rw-r--r--src/gui/curses/gui-curses-chat.c76
22 files changed, 509 insertions, 178 deletions
diff --git a/ChangeLog b/ChangeLog
index 257910492..26e061cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-rc1, 2013-05-01
+v0.4.1-rc1, 2013-05-03
This document lists all changes for each version.
@@ -18,7 +18,9 @@ Version 0.4.1 (under dev!)
* core: make nick prefix/suffix dynamic (not stored in the line): move options
irc.look.nick_{prefix|suffix} to weechat.look.nick_{prefix|suffix} and options
irc.color.nick_{prefix|suffix} to weechat.color.chat_nick_{prefix|suffix},
- add new options logger.file.nick_{prefix|suffix} (bug #37531)
+ add new options weechat.look.prefix_align_more_after,
+ weechat.look.prefix_buffer_align_more_after, logger.file.nick_{prefix|suffix}
+ (bug #37531)
* core: reset scroll in window before zooming on a merged buffer (bug #38207)
* core: install icon file (patch #7972)
* core: fix refresh of item "completion": clear it after any action that is
diff --git a/NEWS b/NEWS
index 47e0e2424..e9610a9ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
WeeChat Release Notes
=====================
Sébastien Helleu <flashcode@flashtux.org>
-v0.4.1-rc1, 2013-05-01
+v0.4.1-rc1, 2013-05-03
This document lists important changes for each version, that require manual
@@ -40,6 +40,41 @@ Options moved from irc plugin (irc.conf) to core (weechat.conf):
Types and default values for these four options remain unchanged.
+Two new options to customize the truncature char (by default "`+`"):
+
+* 'weechat.look.prefix_align_more_after' (boolean, 'on' by default)
+* 'weechat.look.prefix_buffer_align_more_after' (boolean, 'on' by default)
+
+When these options are enabled (default), the "`+`" is displayed after the
+text, replacing the space that should be displayed there. +
+When turned off, the "`+`" will replace last char of text.
+
+Example for a nicks "FlashCode" and "fc" with different values for options
+'weechat.look.prefix_align_max', 'weechat.look.prefix_align_more_after',
+'weechat.look.nick_prefix' and 'weechat.look.nick_suffix':
+
+----------------------------------------
+ # align_max, more_after, prefix/suffix
+
+FlashCode │ test # 0, on
+ fc │ test
+
+FlashCod+│ test # 8, on
+ fc │ test
+
+FlashCo+ │ test # 8, off
+ fc │ test
+
+<FlashCode> │ test # 0, on, < >
+ <fc> │ test
+
+<FlashC>+│ test # 8, on, < >
+ <fc> │ test
+
+<Flash+> │ test # 8, off, < >
+ <fc> │ test
+----------------------------------------
+
After `/upgrade`, if you set new options to non-empty strings, and if old
options were set to non-empty strings too, you will see double prefix/suffix
on old messages, this is normal behaviour (lines displayed before `/upgrade`
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 3615c55d9..19c4fb3b9 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -94,7 +94,7 @@
** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `white`)
* [[option_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
-** Beschreibung: `color for nick suffix (string displayed after nick in suffix)`
+** Beschreibung: `color for nick suffix (string displayed after nick in prefix)`
** Typ: Farbe
** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `green`)
@@ -653,6 +653,11 @@
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** Beschreibung: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
* [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
** Beschreibung: `Einstellung des Präfix für den Namen des Buffers, falls viele Buffer zu einem Buffer zusammengefügt wurden (keine = none, links = left, rechts = right (Standardwert))`
** Typ: integer
@@ -668,6 +673,11 @@
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** Beschreibung: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
** Beschreibung: `Präfix, dass bei einer Fehler-Nachricht angezeigt wird. Durch das Format "${Farbe}" ist es möglich eine Farbauswahl zu treffen.`
** Typ: Zeichenkette
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 98e59f1ee..d7839bc3a 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -94,7 +94,7 @@
** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `white`)
* [[option_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
-** description: `color for nick suffix (string displayed after nick in suffix)`
+** description: `color for nick suffix (string displayed after nick in prefix)`
** type: color
** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `green`)
@@ -653,6 +653,11 @@
** type: string
** values: any string (default value: `"+"`)
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** description: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** type: boolean
+** values: on, off (default value: `on`)
+
* [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
** description: `prefix alignment for buffer name, when many buffers are merged with same number (none, left, right (default))`
** type: integer
@@ -668,6 +673,11 @@
** type: string
** values: any string (default value: `"+"`)
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** description: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** type: boolean
+** values: on, off (default value: `on`)
+
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
** description: `prefix for error messages, colors are allowed with format "${color}"`
** type: string
diff --git a/doc/fr/autogen/user/logger_options.txt b/doc/fr/autogen/user/logger_options.txt
index b2a9c9966..4f7a0ffe0 100644
--- a/doc/fr/autogen/user/logger_options.txt
+++ b/doc/fr/autogen/user/logger_options.txt
@@ -34,12 +34,12 @@
** valeurs: on, off (valeur par défaut: `on`)
* [[option_logger.file.nick_prefix]] *logger.file.nick_prefix*
-** description: `text to write before nick in prefix of message, example: "<"`
+** description: `texte à écrire avant le pseudo dans le préfixe du message, par exemple: "<"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_logger.file.nick_suffix]] *logger.file.nick_suffix*
-** description: `text to write after nick in prefix of message, example: ">"`
+** description: `texte à écrire après le pseudo dans le préfixe du message, par exemple: ">"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 78549ed10..b53ea7b98 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -84,7 +84,7 @@
** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `cyan`)
* [[option_weechat.color.chat_nick_prefix]] *weechat.color.chat_nick_prefix*
-** description: `color for nick prefix (string displayed before nick in prefix)`
+** description: `couleur pour le préfixe du pseudo (chaîne affichée avant le pseudo dans le préfixe)`
** type: couleur
** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `green`)
@@ -94,7 +94,7 @@
** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `white`)
* [[option_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
-** description: `color for nick suffix (string displayed after nick in suffix)`
+** description: `couleur pour le suffixe du pseudo (chaîne affichée après le pseudo dans le préfixe)`
** type: couleur
** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `green`)
@@ -604,12 +604,12 @@
** valeurs: 1 .. 10000 (valeur par défaut: `100`)
* [[option_weechat.look.nick_prefix]] *weechat.look.nick_prefix*
-** description: `text to display before nick in prefix of message, example: "<"`
+** description: `texte à afficher avant le pseudo dans le préfixe, par exemple: "<"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_weechat.look.nick_suffix]] *weechat.look.nick_suffix*
-** description: `text to display after nick in prefix of message, example: ">"`
+** description: `texte à afficher après le pseudo dans le préfixe, par exemple ">"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -653,6 +653,11 @@
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"+"`)
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** description: `afficher le caractère de troncature (par défaut "+") après le texte (en remplaçant l'espace qui devrait être affiché ici); si désactivé, le caractère de troncature remplace le dernier caractère du texte`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
* [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
** description: `alignement de préfixe pour le nom du tampon, quand plusieurs tampons sont mélangés avec le même numéro (none, left, right (par défaut))`
** type: entier
@@ -668,6 +673,11 @@
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"+"`)
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** description: `afficher le caractère de troncature (par défaut "+") après le texte (en remplaçant l'espace qui devrait être affiché ici); si désactivé, le caractère de troncature remplace le dernier caractère du texte`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
** description: `préfixe pour les messages d'erreur, les couleurs sont autorisées avec le format "${couleur}"`
** type: chaîne
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 464317a7f..319545773 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -94,7 +94,7 @@
** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `white`)
* [[option_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
-** descrizione: `color for nick suffix (string displayed after nick in suffix)`
+** descrizione: `color for nick suffix (string displayed after nick in prefix)`
** tipo: colore
** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `green`)
@@ -653,6 +653,11 @@
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"+"`)
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** descrizione: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
* [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
** descrizione: `prefisso di allineamento per il nome del buffer, quando più buffer vengono uniti con lo stesso numero (none (nessuno), left(sinistra), right(destra - predefinito)`
** tipo: intero
@@ -668,6 +673,11 @@
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"+"`)
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** descrizione: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
** descrizione: `prefisso per i messaggi di errore, colori consentiti con il formato "{color}"`
** tipo: stringa
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index fc46bed82..f23010688 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -94,7 +94,7 @@
** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、下線は "_"。 (デフォルト値: `white`)
* [[option_weechat.color.chat_nick_suffix]] *weechat.color.chat_nick_suffix*
-** 説明: `color for nick suffix (string displayed after nick in suffix)`
+** 説明: `color for nick suffix (string displayed after nick in prefix)`
** タイプ: 色
** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、下線は "_"。 (デフォルト値: `green`)
@@ -653,6 +653,11 @@
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"+"`)
+* [[option_weechat.look.prefix_align_more_after]] *weechat.look.prefix_align_more_after*
+** 説明: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `on`)
+
* [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
** 説明: `多くのバッファが同じ番号を持つようにマージされた場合に、バッファ名のプレフィックスを調節 (none, left, right (デフォルト))`
** タイプ: 整数
@@ -668,6 +673,11 @@
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"+"`)
+* [[option_weechat.look.prefix_buffer_align_more_after]] *weechat.look.prefix_buffer_align_more_after*
+** 説明: `display the truncature char (by default "+") after the text (by replacing the space that should be displayed here); if disabled, the truncature char replaces last char of text`
+** タイプ: ブール
+** 値: on, off (デフォルト値: `on`)
+
* [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
** 説明: `エラーメッセージのプレフィックス、フォーマット "${color}" を使えば色を使うことも可能`
** タイプ: 文字列
diff --git a/po/cs.po b/po/cs.po
index 9fd036cb2..d4a330acb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:06+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2675,6 +2675,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "text pro zobrazení před přezdívkou v okně rozhovoru"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "text pro zobrazení za přezdívkou v okně rozhovoru"
+
msgid "enable mouse support"
msgstr ""
@@ -2732,6 +2740,12 @@ msgid ""
msgstr ""
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -2920,6 +2934,15 @@ msgstr ""
"barva textu pro přezdívky (čárkou oddělený seznam barev, pozadí je povoleno "
"ve formátu: \"fg:bg\", například: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"barva prefixu přezdívky (prefix je uživatelský řetězec před přezdívkou)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "barva přípony přezdívky (přípona je uživatelský řetězec za přezdívkou)"
+
msgid "text color for local nick in chat window"
msgstr "barva textu pro lokální přezdívku v okně rozhovoru"
@@ -5930,12 +5953,6 @@ msgstr ""
"pozice (měl by být poslední buffer), next = aktuální buffer + 1, near_server "
"= za posledním kanálem/pv serveru)"
-msgid "text to display before nick in chat window"
-msgstr "text pro zobrazení před přezdívkou v okně rozhovoru"
-
-msgid "text to display after nick in chat window"
-msgstr "text pro zobrazení za přezdívkou v okně rozhovoru"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6187,13 +6204,6 @@ msgstr ""
"speciální mód \"*\" může být použit jako výchozí barva pokud nebyl v seznamu "
"nalezen žádný mód)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"barva prefixu přezdívky (prefix je uživatelský řetězec před přezdívkou)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr "barva přípony přezdívky (přípona je uživatelský řetězec za přezdívkou)"
-
msgid "color for text \"Notice\" in notices"
msgstr "barva textu \"Notice\" v upozorněních"
@@ -7348,6 +7358,12 @@ msgstr ""
"časová známka použita v logovacích souborech (použijte manuálovou stránku "
"strftime pro spcifikátory data/času)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "seznam logovacích bufferů"
diff --git a/po/de.po b/po/de.po
index 40e27d282..f39b66904 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-02 19:40+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:06+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -3105,6 +3105,12 @@ msgstr ""
"wird (es darf nur ein Zeichen genutzt werden)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3330,7 +3336,7 @@ msgstr ""
"dem Nick steht)"
#, fuzzy
-msgid "color for nick suffix (string displayed after nick in suffix)"
+msgid "color for nick suffix (string displayed after nick in prefix)"
msgstr ""
"Farbe für den Nick Suffix (Suffix ist die editierbare Zeichenkette die nach "
"dem Nick steht)"
diff --git a/po/es.po b/po/es.po
index 196c15477..53d65d93a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:06+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2832,6 +2832,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "texto a mostrar antes del apodo en la ventana de charla"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "texto a mostrar tras el apodo en la ventana de charla"
+
msgid "enable mouse support"
msgstr "habilitar soporte para ratón"
@@ -2901,6 +2909,12 @@ msgstr ""
"carácter en pantalla)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3101,6 +3115,16 @@ msgstr ""
"color para los apodos (lista de colores separadas por comas, color de fondo "
"es permitido siguiendo el formato \"fg:bg\", por ejemplo: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"color del prefijo del apodo (el prefijo es el texto mostrado antes del apodo)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"color del sufijo del apodo (el sufijo es el texto mostrado después del apodo)"
+
msgid "text color for local nick in chat window"
msgstr "color para el apodo propio en la ventana de conversación"
@@ -6152,12 +6176,6 @@ msgstr ""
"posición predeterminada (último buffer), next = buffer actual + 1, "
"near_server = después del último canal/privado del server)"
-msgid "text to display before nick in chat window"
-msgstr "texto a mostrar antes del apodo en la ventana de charla"
-
-msgid "text to display after nick in chat window"
-msgstr "texto a mostrar tras el apodo en la ventana de charla"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6443,14 +6461,6 @@ msgstr ""
"especial \"*\" puede usarse como color por defecto si ningún modo fue "
"encontrado en la lista)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"color del prefijo del apodo (el prefijo es el texto mostrado antes del apodo)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-"color del sufijo del apodo (el sufijo es el texto mostrado después del apodo)"
-
msgid "color for text \"Notice\" in notices"
msgstr "color para el texto \"Aviso\" en los mensajes de aviso"
@@ -7614,6 +7624,12 @@ msgstr ""
"formato de hora en el registro (ver el manual de strftime para los "
"especificadores de fecha/hora)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "lista de buffers con registro"
diff --git a/po/fr.po b/po/fr.po
index 77385f89a..f22e545fe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
-"PO-Revision-Date: 2013-05-01 10:06+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
+"PO-Revision-Date: 2013-05-03 18:57+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -2922,6 +2922,12 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr "retourner au tampon initial après avoir atteint la fin de la hotlist"
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "texte à afficher avant le pseudo dans le préfixe, par exemple: \"<\""
+
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "texte à afficher après le pseudo dans le préfixe, par exemple \">\""
+
msgid "enable mouse support"
msgstr "activer le support de la souris"
@@ -3000,6 +3006,15 @@ msgstr ""
"caractère à l'écran)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+"afficher le caractère de troncature (par défaut \"+\") après le texte (en "
+"remplaçant l'espace qui devrait être affiché ici); si désactivé, le "
+"caractère de troncature remplace le dernier caractère du texte"
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3206,6 +3221,16 @@ msgstr ""
"virgule, un fond est autorisé avec le format: \"couleur:fond\", par exemple: "
"\"lightred:blue\")"
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"couleur pour le préfixe du pseudo (chaîne affichée avant le pseudo dans le "
+"préfixe)"
+
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"couleur pour le suffixe du pseudo (chaîne affichée après le pseudo dans le "
+"préfixe)"
+
msgid "text color for local nick in chat window"
msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion"
@@ -6328,12 +6353,6 @@ msgstr ""
"position par défaut (devrait être le dernier tampon), next = tampon courant "
"+ 1, near_server = après le dernier canal/privé du serveur)"
-msgid "text to display before nick in chat window"
-msgstr "texte à afficher avant le pseudo dans la fenêtre de discussion"
-
-msgid "text to display after nick in chat window"
-msgstr "texte à afficher après le pseudo dans la fenêtre de discussion"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6648,16 +6667,6 @@ msgstr ""
"suivants reçus du serveur (\"PREFIX\"); un mode spécial \"*\" peut être "
"utilisé comme couleur par défaut si aucun mode n'est trouvé dans la liste)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"couleur pour le préfixe du pseudo (le préfixe est une chaîne personnalisée "
-"affichée avant le pseudo)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-"couleur pour le suffixe du pseudo (le suffixe est une chaîne personnalisée "
-"affichée après le pseudo)"
-
msgid "color for text \"Notice\" in notices"
msgstr "couleur pour le texte \"Notice\" dans les notices"
@@ -7822,6 +7831,14 @@ msgstr ""
"format de date/heure utilisé dans les fichiers log (voir man strftime pour "
"le format de date/heure)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+"texte à écrire avant le pseudo dans le préfixe du message, par exemple: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+"texte à écrire après le pseudo dans le préfixe du message, par exemple: \">\""
+
msgid "list of logger buffers"
msgstr "liste des enregistreurs de tampons (loggers)"
@@ -10042,6 +10059,3 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
-
-#~ msgid "display names when joining channel"
-#~ msgstr "afficher les noms lorsqu'on rejoint un canal"
diff --git a/po/hu.po b/po/hu.po
index 83d93c693..640404e8c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:06+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2298,6 +2298,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "a név után megjelenítendő szöveg a beszédablakban"
+
msgid "enable mouse support"
msgstr ""
@@ -2357,6 +2365,12 @@ msgid ""
msgstr ""
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -2538,6 +2552,13 @@ msgid ""
"with format: \"fg:bg\", for example: \"lightred:blue\")"
msgstr "idő színe a beszédablakban"
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "névkiegészítés után beszúrt szöveg"
+
#, fuzzy
msgid "text color for local nick in chat window"
msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
@@ -5486,12 +5507,6 @@ msgid ""
"channel/pv of server)"
msgstr ""
-msgid "text to display before nick in chat window"
-msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
-
-msgid "text to display after nick in chat window"
-msgstr "a név után megjelenítendő szöveg a beszédablakban"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -5715,12 +5730,6 @@ msgid ""
"\"*\" can be used as default color if no mode has been found in list)"
msgstr ""
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-
#, fuzzy
msgid "color for text \"Notice\" in notices"
msgstr "új üzenetet tartalmazó ablak színe"
@@ -6825,6 +6834,12 @@ msgstr ""
msgid "timestamp used in log files (see man strftime for date/time specifiers)"
msgstr ""
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
#, fuzzy
msgid "list of logger buffers"
msgstr "a pufferek időbélyege"
diff --git a/po/it.po b/po/it.po
index ca6239831..0ab0a66bf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:07+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2814,6 +2814,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr "torna al buffer iniziale dopo aver raggiunto la fine della hotlist"
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "testo da visualizzare prima del nick nella finestra di chat"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "testo da visualizzare dopo il nick nella finestra di chat"
+
msgid "enable mouse support"
msgstr "abilita il supporto del mouse"
@@ -2891,6 +2899,12 @@ msgstr ""
"carattere sullo schermo)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3093,6 +3107,18 @@ msgstr ""
"colore del testo per i nick (elenco separato da virgole di colori, quello di "
"sfondo è consentito con il formato \"fg:bg\", ad esempio: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"colore per il prefisso del nick (il prefisso è la stringa personalizzata "
+"visualizzata prima del nick)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"colore per il suffisso del nick (il suffisso è la stringa personalizzata "
+"visualizzata dopo il nick)"
+
msgid "text color for local nick in chat window"
msgstr "colore del testo per il nick locale nella finestra di chat"
@@ -6155,12 +6181,6 @@ msgstr ""
"posizione predefinita (dovrebbe essere l'ultimo buffer), next = buffer "
"corrente + 1, near_server = dopo l'ultimo canale/privato del server)"
-msgid "text to display before nick in chat window"
-msgstr "testo da visualizzare prima del nick nella finestra di chat"
-
-msgid "text to display after nick in chat window"
-msgstr "testo da visualizzare dopo il nick nella finestra di chat"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6460,16 +6480,6 @@ msgstr ""
"ricevute dal server (\"PREFIX\"); può essere usata una modalità speciale \"*"
"\" come colore prefefinito se non viene trovata nessuna modalità nella lista)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"colore per il prefisso del nick (il prefisso è la stringa personalizzata "
-"visualizzata prima del nick)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-"colore per il suffisso del nick (il suffisso è la stringa personalizzata "
-"visualizzata dopo il nick)"
-
msgid "color for text \"Notice\" in notices"
msgstr "colore per il testo \"Notifica\" nelle notifiche"
@@ -7625,6 +7635,12 @@ msgstr ""
"data e ora usati nei file di log (consultare man strftime per gli "
"specificatori di data/ora)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "elenco dei buffer logger"
diff --git a/po/ja.po b/po/ja.po
index 874f334f2..bd6047e05 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:07+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -2837,6 +2837,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr "ホットリストの最後に到達したら最初のバッファに移動する"
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "チャットウィンドウ内でニックネーム前に表示するテキスト"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "チャットウィンドウ内でニックネーム後に表示するテキスト"
+
msgid "enable mouse support"
msgstr "マウスサポートの有効化"
@@ -2911,6 +2919,12 @@ msgstr ""
"字)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3100,6 +3114,18 @@ msgstr ""
"ニックネームのテキスト色 (カンマ区切りの色リスト、背景色は以下のフォーマット"
"で指定: \"fg:bg\"、例: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"ニックネームプレフィックスの色 (プレフィックスとはニックネームの前に表示され"
+"たカスタム文字列)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"ニックネームサフィックスの色 (サフィックスとはニックネームの後に表示されたカ"
+"スタム文字列)"
+
msgid "text color for local nick in chat window"
msgstr "チャットウィンドウ内のローカルニックネームのテキスト色"
@@ -6113,12 +6139,6 @@ msgstr ""
"位置 (一番後ろのバッファ)、next = 現在のバッファ番号 + 1、near_server = サー"
"バの一番後ろのチャンネル/プライベートバッファ)"
-msgid "text to display before nick in chat window"
-msgstr "チャットウィンドウ内でニックネーム前に表示するテキスト"
-
-msgid "text to display after nick in chat window"
-msgstr "チャットウィンドウ内でニックネーム後に表示するテキスト"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6403,16 +6423,6 @@ msgstr ""
"場合、WeeChat はサーバから受け取ったモードの次のものを試す (\"PREFIX\"); モー"
"ドが見つからなかった場合は、特殊なモード \"*\" がデフォルト色として使えます)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"ニックネームプレフィックスの色 (プレフィックスとはニックネームの前に表示され"
-"たカスタム文字列)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-"ニックネームサフィックスの色 (サフィックスとはニックネームの後に表示されたカ"
-"スタム文字列)"
-
msgid "color for text \"Notice\" in notices"
msgstr "notices に含まれるテキスト \"Notice\" の色"
@@ -7549,6 +7559,12 @@ msgid "timestamp used in log files (see man strftime for date/time specifiers)"
msgstr ""
"ログファイルで使用するタイムスタンプ (日付/時間指定子は strftime の man 参照)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "logger バッファのリスト"
diff --git a/po/pl.po b/po/pl.po
index 0f2775354..4bf52591f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:07+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -29,7 +29,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
#. TRANSLATORS: "%s %s" after "compiled on" is date and time
#, c-format
@@ -2901,6 +2902,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr "wróć do początkowego buforu po dotarciu na koniec hotlisty"
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "teks wyświetlany przed nickiem w oknie rozmowy"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "teks wyświetlany za nickiem w oknie rozmowy"
+
msgid "enable mouse support"
msgstr "włącza wsparcie dla myszy"
@@ -2978,6 +2987,12 @@ msgstr ""
"ekranie)"
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3178,6 +3193,15 @@ msgstr ""
"kolor tekstu nicków (oddzielona przecinkami lista kolorów, tło jest "
"dozwolone za pomocą formatu: \"fg:bg\" na przykład: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"kolor przedrostka nicka (przedrostek to ciąg wyświetlany przed nickiem)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "kolor przyrostka nicka (przyrostek to ciąg wyświetlany za nickiem)"
+
msgid "text color for local nick in chat window"
msgstr "kolor lokalnego nicka w oknie rozmowy"
@@ -6237,12 +6261,6 @@ msgstr ""
"domyślna pozycja (powinien być to ostatni bufor), next = obecny bufor + 1, "
"near_server = po ostatnim kanale/pv serwera)"
-msgid "text to display before nick in chat window"
-msgstr "teks wyświetlany przed nickiem w oknie rozmowy"
-
-msgid "text to display after nick in chat window"
-msgstr "teks wyświetlany za nickiem w oknie rozmowy"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -6534,13 +6552,6 @@ msgstr ""
"(\"PREFIX\"); specjalny tryb \"*\" może zostać użyty jako domyślny kolor "
"jeśli nie znaleziono atrybutu na liście)"
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"kolor przedrostka nicka (przedrostek to ciąg wyświetlany przed nickiem)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr "kolor przyrostka nicka (przyrostek to ciąg wyświetlany za nickiem)"
-
msgid "color for text \"Notice\" in notices"
msgstr "kolor tekstu \"Notice\" w podświetleniach"
@@ -7691,6 +7702,12 @@ msgstr ""
"format czasu użyty w plikach z logami (zobacz man strftime dla "
"specyfikatorów daty/czasu)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "lista logowanych buforów"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 576b2c908..6bd2c3fb7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:07+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2754,6 +2754,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "texto a ser exibido antes do apelido na janela de chat"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "texto a ser exibido depois do apelido na janela de chat"
+
msgid "enable mouse support"
msgstr ""
@@ -2811,6 +2819,12 @@ msgid ""
msgstr ""
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -3003,6 +3017,18 @@ msgstr ""
"cor do texto para apelidos (lista de cores separada por vírgulas, fundo é "
"permitido com o formato: \"fg:bg\", por exemplo: \"lightred:blue\")"
+#, fuzzy
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+"cor para o prefixo do apelido (o prefixo é uma string customizada exibida "
+"antes de um apelido)"
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"cor para o sufixo do apelido (o sufixo é uma string customizada exibida "
+"depois de um apelido)"
+
msgid "text color for local nick in chat window"
msgstr "cor de texto para apelido local na janela de conversa"
@@ -5667,12 +5693,6 @@ msgid ""
"channel/pv of server)"
msgstr ""
-msgid "text to display before nick in chat window"
-msgstr "texto a ser exibido antes do apelido na janela de chat"
-
-msgid "text to display after nick in chat window"
-msgstr "texto a ser exibido depois do apelido na janela de chat"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -5894,16 +5914,6 @@ msgid ""
"\"*\" can be used as default color if no mode has been found in list)"
msgstr ""
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-"cor para o prefixo do apelido (o prefixo é uma string customizada exibida "
-"antes de um apelido)"
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-"cor para o sufixo do apelido (o sufixo é uma string customizada exibida "
-"depois de um apelido)"
-
msgid "color for text \"Notice\" in notices"
msgstr ""
@@ -7027,6 +7037,12 @@ msgstr ""
"marca de tempo utilizada nos arquivos de registro (veja \"man strftime\" "
"para especificadores de data/tempo)"
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr "lista de buffers de registro"
diff --git a/po/ru.po b/po/ru.po
index 3ff9f9be7..541b3599b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-rc1\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-05-01 10:07+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -29,7 +29,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"
#. TRANSLATORS: "%s %s" after "compiled on" is date and time
@@ -2327,6 +2328,14 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+#, fuzzy
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr "текст, который отображать до ника в окне чата"
+
+#, fuzzy
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr "текст, который отображать после ника в окне чата"
+
msgid "enable mouse support"
msgstr ""
@@ -2387,6 +2396,12 @@ msgid ""
msgstr ""
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -2568,6 +2583,13 @@ msgid ""
"with format: \"fg:bg\", for example: \"lightred:blue\")"
msgstr "цвет времени в окне чата"
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "строка, вставляемая после автодополнения ника"
+
#, fuzzy
msgid "text color for local nick in chat window"
msgstr "текст, который отображать до ника в окне чата"
@@ -5507,12 +5529,6 @@ msgid ""
"channel/pv of server)"
msgstr ""
-msgid "text to display before nick in chat window"
-msgstr "текст, который отображать до ника в окне чата"
-
-msgid "text to display after nick in chat window"
-msgstr "текст, который отображать после ника в окне чата"
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -5736,12 +5752,6 @@ msgid ""
"\"*\" can be used as default color if no mode has been found in list)"
msgstr ""
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-
#, fuzzy
msgid "color for text \"Notice\" in notices"
msgstr "цвет текущего окна с сообщениями"
@@ -6851,6 +6861,12 @@ msgstr ""
msgid "timestamp used in log files (see man strftime for date/time specifiers)"
msgstr ""
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
#, fuzzy
msgid "list of logger buffers"
msgstr "время в буферах"
diff --git a/po/weechat.pot b/po/weechat.pot
index 3b8f069e4..475570ed2 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-05-01 09:48+0200\n"
+"POT-Creation-Date: 2013-05-03 18:56+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2059,6 +2059,12 @@ msgstr ""
msgid "jump back to initial buffer after reaching end of hotlist"
msgstr ""
+msgid "text to display before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to display after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
@@ -2113,6 +2119,12 @@ msgid ""
msgstr ""
msgid ""
+"display the truncature char (by default \"+\") after the text (by replacing "
+"the space that should be displayed here); if disabled, the truncature char "
+"replaces last char of text"
+msgstr ""
+
+msgid ""
"prefix alignment for buffer name, when many buffers are merged with same "
"number (none, left, right (default))"
msgstr ""
@@ -2270,6 +2282,12 @@ msgid ""
"with format: \"fg:bg\", for example: \"lightred:blue\")"
msgstr ""
+msgid "color for nick prefix (string displayed before nick in prefix)"
+msgstr ""
+
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+
msgid "text color for local nick in chat window"
msgstr ""
@@ -4769,12 +4787,6 @@ msgid ""
"channel/pv of server)"
msgstr ""
-msgid "text to display before nick in chat window"
-msgstr ""
-
-msgid "text to display after nick in chat window"
-msgstr ""
-
msgid ""
"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
"prefix only (default), action = in action messages only, both = prefix + "
@@ -4987,12 +4999,6 @@ msgid ""
"\"*\" can be used as default color if no mode has been found in list)"
msgstr ""
-msgid "color for nick prefix (prefix is custom string displayed before nick)"
-msgstr ""
-
-msgid "color for nick suffix (suffix is custom string displayed after nick)"
-msgstr ""
-
msgid "color for text \"Notice\" in notices"
msgstr ""
@@ -6029,6 +6035,12 @@ msgstr ""
msgid "timestamp used in log files (see man strftime for date/time specifiers)"
msgstr ""
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
msgid "list of logger buffers"
msgstr ""
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 9b2ea82bb..8c932c416 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -136,9 +136,11 @@ struct t_config_option *config_look_prefix_align;
struct t_config_option *config_look_prefix_align_max;
struct t_config_option *config_look_prefix_align_min;
struct t_config_option *config_look_prefix_align_more;
+struct t_config_option *config_look_prefix_align_more_after;
struct t_config_option *config_look_prefix_buffer_align;
struct t_config_option *config_look_prefix_buffer_align_max;
struct t_config_option *config_look_prefix_buffer_align_more;
+struct t_config_option *config_look_prefix_buffer_align_more_after;
struct t_config_option *config_look_prefix_same_nick;
struct t_config_option *config_look_prefix_suffix;
struct t_config_option *config_look_read_marker;
@@ -2274,6 +2276,14 @@ config_weechat_init_options ()
"on screen)"),
NULL, 0, 0, "+", NULL, 0,
&config_check_prefix_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
+ config_look_prefix_align_more_after = config_file_new_option (
+ weechat_config_file, ptr_section,
+ "prefix_align_more_after", "boolean",
+ N_("display the truncature char (by default \"+\") after the text (by "
+ "replacing the space that should be displayed here); if disabled, "
+ "the truncature char replaces last char of text"),
+ NULL, 0, 0, "on", NULL, 0,
+ NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
config_look_prefix_buffer_align = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_buffer_align", "integer",
@@ -2293,6 +2303,14 @@ config_weechat_init_options ()
"merged with same number) (must be exactly one char on screen)"),
NULL, 0, 0, "+", NULL, 0,
&config_check_prefix_buffer_align_more, NULL, &config_change_buffers, NULL, NULL, NULL);
+ config_look_prefix_buffer_align_more_after = config_file_new_option (
+ weechat_config_file, ptr_section,
+ "prefix_buffer_align_more_after", "boolean",
+ N_("display the truncature char (by default \"+\") after the text (by "
+ "replacing the space that should be displayed here); if disabled, "
+ "the truncature char replaces last char of text"),
+ NULL, 0, 0, "on", NULL, 0,
+ NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
config_look_prefix_same_nick = config_file_new_option (
weechat_config_file, ptr_section,
"prefix_same_nick", "string",
@@ -2575,7 +2593,7 @@ config_weechat_init_options ()
config_color_chat_nick_suffix = config_file_new_option (
weechat_config_file, ptr_section,
"chat_nick_suffix", "color",
- N_("color for nick suffix (string displayed after nick in suffix)"),
+ N_("color for nick suffix (string displayed after nick in prefix)"),
NULL, GUI_COLOR_CHAT_NICK_SUFFIX, 0, "green", NULL, 0, NULL, NULL,
&config_change_color, NULL, NULL, NULL);
config_color_chat_nick_self = config_file_new_option (
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 966d9b356..df4c01fcb 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -160,9 +160,11 @@ extern struct t_config_option *config_look_prefix_align;
extern struct t_config_option *config_look_prefix_align_max;
extern struct t_config_option *config_look_prefix_align_min;
extern struct t_config_option *config_look_prefix_align_more;
+extern struct t_config_option *config_look_prefix_align_more_after;
extern struct t_config_option *config_look_prefix_buffer_align;
extern struct t_config_option *config_look_prefix_buffer_align_max;
extern struct t_config_option *config_look_prefix_buffer_align_more;
+extern struct t_config_option *config_look_prefix_buffer_align_more_after;
extern struct t_config_option *config_look_prefix_same_nick;
extern struct t_config_option *config_look_prefix_suffix;
extern struct t_config_option *config_look_read_marker;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index b38cf0601..b75b5e3e1 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -607,6 +607,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
const char *short_name, *str_color, *ptr_nick_prefix, *ptr_nick_suffix;
int i, length, length_allowed, num_spaces, prefix_length, extra_spaces;
int chars_displayed, nick_offline, prefix_is_nick, length_nick_prefix_suffix;
+ int chars_to_display;
struct t_gui_lines *mixed_lines;
if (!simulate)
@@ -703,11 +704,18 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
if ((CONFIG_INTEGER(config_look_prefix_buffer_align) != CONFIG_LOOK_PREFIX_BUFFER_ALIGN_NONE)
&& (num_spaces < 0))
{
+ chars_to_display = length_allowed;
+ /*
+ * if the "+" is not displayed in the space after text, remove one
+ * more char to display the "+" before the space
+ */
+ if (!CONFIG_BOOLEAN(config_look_prefix_buffer_align_more_after))
+ chars_to_display--;
gui_chat_display_word (window, line,
short_name,
short_name +
gui_chat_string_real_pos (short_name,
- length_allowed),
+ chars_to_display),
1, num_lines, count, lines_displayed,
simulate,
CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer),
@@ -739,6 +747,21 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
simulate,
CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer),
0);
+ if (!CONFIG_BOOLEAN(config_look_prefix_buffer_align_more_after))
+ {
+ if (!simulate)
+ {
+ gui_chat_reset_style (window, line, 0, 1,
+ GUI_COLOR_CHAT_INACTIVE_WINDOW,
+ GUI_COLOR_CHAT_INACTIVE_BUFFER,
+ GUI_COLOR_CHAT);
+ }
+ gui_chat_display_word (window, line, str_space,
+ NULL, 1, num_lines, count, lines_displayed,
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix),
+ 0);
+ }
}
else
{
@@ -926,13 +949,20 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
&& (num_spaces < 0))
{
+ chars_to_display = length_allowed - length_nick_prefix_suffix;
+ /*
+ * if the "+" is not displayed in the space after text, remove one
+ * more char to display the "+" before the space
+ */
+ if (!CONFIG_BOOLEAN(config_look_prefix_align_more_after))
+ chars_to_display--;
chars_displayed = gui_chat_display_word (window, line,
(prefix_highlighted) ? prefix_highlighted : ptr_prefix,
(prefix_highlighted) ?
prefix_highlighted + gui_chat_string_real_pos (prefix_highlighted,
- length_allowed - length_nick_prefix_suffix - 1) :
+ chars_to_display) :
ptr_prefix + gui_chat_string_real_pos (ptr_prefix,
- length_allowed - length_nick_prefix_suffix - 1),
+ chars_to_display),
1, num_lines, count, lines_displayed,
simulate,
CONFIG_BOOLEAN(config_look_color_inactive_prefix),
@@ -972,7 +1002,8 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
0);
}
- if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
+ if (!CONFIG_BOOLEAN(config_look_prefix_align_more_after)
+ && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
&& (num_spaces < 0))
{
if (!simulate)
@@ -1004,6 +1035,13 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
if (CONFIG_INTEGER(config_look_prefix_align) == CONFIG_LOOK_PREFIX_ALIGN_LEFT)
{
+ if (!simulate)
+ {
+ gui_chat_reset_style (window, line, 0, 1,
+ GUI_COLOR_CHAT_INACTIVE_WINDOW,
+ GUI_COLOR_CHAT_INACTIVE_BUFFER,
+ GUI_COLOR_CHAT);
+ }
for (i = 0; i < num_spaces; i++)
{
gui_chat_display_word (window, line, str_space,
@@ -1014,14 +1052,40 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
}
}
- if (window->buffer->lines->prefix_max_length > 0)
+ if (CONFIG_BOOLEAN(config_look_prefix_align_more_after)
+ && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
+ && (num_spaces < 0))
{
- gui_chat_display_word (window, line, str_space,
+ if (!simulate)
+ {
+ gui_window_set_weechat_color (GUI_WINDOW_OBJECTS(window)->win_chat,
+ GUI_COLOR_CHAT_PREFIX_MORE);
+ }
+ gui_chat_display_word (window, line,
+ CONFIG_STRING(config_look_prefix_align_more),
NULL, 1, num_lines, count, lines_displayed,
simulate,
CONFIG_BOOLEAN(config_look_color_inactive_prefix),
0);
}
+ else
+ {
+ if (window->buffer->lines->prefix_max_length > 0)
+ {
+ if (!simulate)
+ {
+ gui_chat_reset_style (window, line, 0, 1,
+ GUI_COLOR_CHAT_INACTIVE_WINDOW,
+ GUI_COLOR_CHAT_INACTIVE_BUFFER,
+ GUI_COLOR_CHAT);
+ }
+ gui_chat_display_word (window, line, str_space,
+ NULL, 1, num_lines, count, lines_displayed,
+ simulate,
+ CONFIG_BOOLEAN(config_look_color_inactive_prefix),
+ 0);
+ }
+ }
if ((CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE)
&& CONFIG_STRING(config_look_prefix_suffix)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 13:06:46 +0000