diff --git a/ChangeLog b/ChangeLog
index 1daa9579a..13aa606b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ v0.3.8-dev, 2012-04-07
 Version 0.3.8 (under dev!)
 --------------------------
 
+* core: convert options weechat.look.prefix_align_more and
+  weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
 * core: fix display bug with prefix when length is greater than max and prefix
   is ending with a wide char (bug #36032)
 * core: add option weechat.look.prefix_same_nick (hide or change prefix on
diff --git a/NEWS b/NEWS
index 961f8995f..970e235b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 WeeChat Release Notes
 =====================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8-dev, 2012-03-13
+v0.3.8-dev, 2012-04-07
 
 
 Version 0.3.8 (under dev!)
@@ -9,6 +9,11 @@ Version 0.3.8 (under dev!)
 
 Important release notes:
 
+* options weechat.look.prefix_align_more and weechat.look.prefix_buffer_align_more
+  have been converted from type boolean to string:
+** if the value was on (default), new value is "+" and you can now customize
+   this char
+** if the value was off, you have to set " " (string with one space)
 * option weechat.look.paste_max_lines can now be used with value 0 to detect
   paste with one line (only if terminal "bracketed paste mode" is enabled when
   option 'weechat.look.paste_bracketed' is on); so now the value -1 is used
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 11707285f..c12b67d1e 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -614,9 +614,9 @@
 ** Werte: 0 .. 128 (Standardwert: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** Beschreibung: `Anzeige eines '+' falls das Präfix abgeschnitten ist`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
+** Beschreibung: `char to display if prefix is truncated (must be exactly one char on screen)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
 * [[option_weechat.look.prefix_buffer_align]] *weechat.look.prefix_buffer_align*
 ** Beschreibung: `Einstellung des Präfix für den Buffer-Namen falls viele Buffer zu einem Buffer zusammengefügt wurden (keine = none, links = left, rechts = right (Standardwert))`
@@ -629,9 +629,9 @@
 ** Werte: 0 .. 128 (Standardwert: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** Beschreibung: `Stellt das Symbol '+' dar falls der Buffername gekürzt wurde (wenn mehrere Buffer zusammengefügt wurden und diese somit die selbe Nummer besitzen)`
-** Typ: boolesch
-** Werte: on, off (Standardwert: `on`)
+** Beschreibung: `char to display if buffer name is truncated (when many buffers are merged with same number) (must be exactly one char on screen)`
+** Typ: Zeichenkette
+** Werte: beliebige Zeichenkette (Standardwert: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** Beschreibung: `Präfix für Fehlermeldungen`
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index ed3748358..9a00ad2fa 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -614,9 +614,9 @@
 ** values: 0 .. 128 (default value: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** description: `display '+' if prefix is truncated`
-** type: boolean
-** values: on, off (default value: `on`)
+** description: `char to display if prefix is truncated (must be exactly one char on screen)`
+** type: string
+** values: any string (default value: `"+"`)
 
 * [[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))`
@@ -629,9 +629,9 @@
 ** values: 0 .. 128 (default value: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** description: `display '+' if buffer name is truncated (when many buffers are merged with same number)`
-** type: boolean
-** values: on, off (default value: `on`)
+** description: `char to display if buffer name is truncated (when many buffers are merged with same number) (must be exactly one char on screen)`
+** type: string
+** values: any string (default value: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** description: `prefix for error messages`
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 12fc20b03..5f64071e3 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -614,9 +614,9 @@
 ** valeurs: 0 .. 128 (valeur par défaut: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** description: `afficher '+' si le préfixe est tronqué`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
+** description: `caractère à afficher si le préfixe est tronqué (doit être exactement un caractère à l'écran)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"+"`)
 
 * [[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))`
@@ -629,9 +629,9 @@
 ** valeurs: 0 .. 128 (valeur par défaut: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** description: `afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont mélangés avec le même numéro)`
-** type: booléen
-** valeurs: on, off (valeur par défaut: `on`)
+** description: `caractère à afficher si le nom du tampon est tronqué (lorsque plusieurs tampons sont mélangés avec le même numéro) (doit être exactement un caractère à l'écran)`
+** type: chaîne
+** valeurs: toute chaîne (valeur par défaut: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** description: `préfixe pour les messages d'erreur`
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 2566dcb2c..987996a04 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -614,9 +614,9 @@
 ** valori: 0 .. 128 (valore predefinito: `0`)
 
 * [[option_weechat.look.prefix_align_more]] *weechat.look.prefix_align_more*
-** descrizione: `mostra '+' se il prefisso è troncato`
-** tipo: bool
-** valori: on, off (valore predefinito: `on`)
+** descrizione: `char to display if prefix is truncated (must be exactly one char on screen)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"+"`)
 
 * [[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)`
@@ -629,9 +629,9 @@
 ** valori: 0 .. 128 (valore predefinito: `0`)
 
 * [[option_weechat.look.prefix_buffer_align_more]] *weechat.look.prefix_buffer_align_more*
-** descrizione: `visualizza '+' se il nome del buffer è troncato (quando più buffer sono uniti con lo stesso numero)`
-** tipo: bool
-** valori: on, off (valore predefinito: `on`)
+** descrizione: `char to display if buffer name is truncated (when many buffers are merged with same number) (must be exactly one char on screen)`
+** tipo: stringa
+** valori: qualsiasi stringa (valore predefinito: `"+"`)
 
 * [[option_weechat.look.prefix_error]] *weechat.look.prefix_error*
 ** descrizione: `prefisso per i messaggi di errore`
diff --git a/po/cs.po b/po/cs.po
index b215bd1a6..cd73c90ae 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2557,8 +2557,9 @@ msgstr "maximální velikost prefixu (0 = žádná maximální velikost)"
 msgid "min size for prefix"
 msgstr "minimální velikost prefixu"
 
-msgid "display '+' if prefix is truncated"
-msgstr "zobrazit '+' pokud je prefix zkrácen"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2574,9 +2575,10 @@ msgstr ""
 "maximální velikost jména bufferu, při spojení více bufferů se stejným číslem "
 "(0 = žádná maximální velikost)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "zobrazit '+' pokud je jméno bufferu zkráceno (při spojení vice bufferů se "
 "stejným číslem)"
@@ -8342,6 +8344,9 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "zobrazit '+' pokud je prefix zkrácen"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<přezdívka> <kanál>"
 
diff --git a/po/de.po b/po/de.po
index ce0a1ee9f..8e9f81616 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-03-27 22:46+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -2811,8 +2811,9 @@ msgstr "maximale Größe des Präfix (0 = keine Limitierung)"
 msgid "min size for prefix"
 msgstr "minimale Größe des Präfix"
 
-msgid "display '+' if prefix is truncated"
-msgstr "Anzeige eines '+' falls das Präfix abgeschnitten ist"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2829,9 +2830,10 @@ msgstr ""
 "maximale Größe für einen Buffer-Namen falls mehrere Buffer zusammengefügt "
 "worden sind (0 = keine Größenbegrenzung)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "Stellt das Symbol '+' dar falls der Buffername gekürzt wurde (wenn mehrere "
 "Buffer zusammengefügt wurden und diese somit die selbe Nummer besitzen)"
@@ -8874,6 +8876,9 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Konstanten"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "Anzeige eines '+' falls das Präfix abgeschnitten ist"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<nick> <channel>"
 
diff --git a/po/es.po b/po/es.po
index c70dafbd5..226565adf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2699,8 +2699,9 @@ msgstr "tamaño máximo para el prefijo (0 = no hay límite)"
 msgid "min size for prefix"
 msgstr "tamaño mínimo para el prefijo"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostrar '+' si el prefijo ha sido truncado"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2716,9 +2717,10 @@ msgstr ""
 "tamaño máximo para el nombre del buffer, cuando varios buffers están "
 "fusionados con el mismo número (0 = sin tamaño máximo)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "muestra '+' si el nombre es truncado (cuando varios buffers están fusionados "
 "con el mismo número)"
@@ -8608,6 +8610,9 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostrar '+' si el prefijo ha sido truncado"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<apodo> <canal>"
 
diff --git a/po/fr.po b/po/fr.po
index b6b9a8914..39036913a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
-"PO-Revision-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
+"PO-Revision-Date: 2012-04-07 13:05+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -2716,8 +2716,11 @@ msgstr "taille maximum pour le préfixe (0 = pas de taille maximum)"
 msgid "min size for prefix"
 msgstr "taille minimum pour le préfixe"
 
-msgid "display '+' if prefix is truncated"
-msgstr "afficher '+' si le préfixe est tronqué"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
+"caractère à afficher si le préfixe est tronqué (doit être exactement un "
+"caractère à l'écran)"
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2734,11 +2737,12 @@ msgstr ""
 "avec le même numéro (0 = pas de taille maximum)"
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
-"afficher '+' si le nom du tampon est tronqué (quand plusieurs tampons sont "
-"mélangés avec le même numéro)"
+"caractère à afficher si le nom du tampon est tronqué (lorsque plusieurs "
+"tampons sont mélangés avec le même numéro) (doit être exactement un "
+"caractère à l'écran)"
 
 msgid ""
 "prefix displayed for a message with same nick as previous message: use a "
@@ -8675,6 +8679,9 @@ msgstr "Type"
 msgid "Constants"
 msgstr "Constantes"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "afficher '+' si le préfixe est tronqué"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<pseudo> <canal>"
 
diff --git a/po/hu.po b/po/hu.po
index cd4e9c08d..d1f47caa4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2203,7 +2203,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr "névkiegészítés után beszúrt szöveg"
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -2217,8 +2218,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
diff --git a/po/it.po b/po/it.po
index 80d1b5981..72aa67bb2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2689,8 +2689,9 @@ msgstr "dimensione massima prefisso (0 = nessuna dimensione massima)"
 msgid "min size for prefix"
 msgstr "dimensione minima per il prefisso"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostra '+' se il prefisso è troncato"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2707,9 +2708,10 @@ msgstr ""
 "allineamento del prefisso per nome buffer, quando più buffer sono uniti con "
 "lo stesso numero (0 = nessuna dimensione massima)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "visualizza '+' se il nome del buffer è troncato (quando più buffer sono "
 "uniti con lo stesso numero)"
@@ -8583,6 +8585,9 @@ msgstr "Tipo"
 msgid "Constants"
 msgstr "Costanti"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostra '+' se il prefisso è troncato"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<nick> <canale>"
 
diff --git a/po/ja.po b/po/ja.po
index 6a985535c..32abc058b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: \"AYANOKOUZI, Ryuunosuke\" <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese\n"
@@ -2637,8 +2637,9 @@ msgstr "プレフィックスのサイズの最大値 (0 = 最大値の指定無
 msgid "min size for prefix"
 msgstr "プレフィックスサイズの最小値"
 
-msgid "display '+' if prefix is truncated"
-msgstr "プレフィックスが切り詰められた場合は '+' を表示"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2654,9 +2655,10 @@ msgstr ""
 "多くのバッファが同じ番号を持つようにマージされた場合の、バッファ名のサイズの"
 "最大値 (0 = 最大値の指定無し)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "バッファ名が切り詰められた場合は '+' を表示 (多くのバッファが同じ番号を持つよ"
 "うにマージされた場合)"
@@ -8384,6 +8386,9 @@ msgstr "タイプ"
 msgid "Constants"
 msgstr "定数"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "プレフィックスが切り詰められた場合は '+' を表示"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<nick> <channel>"
 
diff --git a/po/pl.po b/po/pl.po
index 9b27e02d1..b6409d15a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2697,8 +2697,9 @@ msgstr "maksymalny rozmiar przedrostka (0 = brak maksymalnego rozmiaru)"
 msgid "min size for prefix"
 msgstr "minimalny rozmiar przedrostka"
 
-msgid "display '+' if prefix is truncated"
-msgstr "wyświetl '+', jeśli przedrostek jest obcięty"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2714,9 +2715,10 @@ msgstr ""
 "maksymalna długość nazwy bufora, kiedy wiele buforów jest połączonych z "
 "identycznym numerem (0 = brak maksymalnej długości)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "wyświetl '+' jeśli nazwa bufora została obcięta (kiedy wiele buforów jest "
 "scalonych z takim samym numerem)"
@@ -8518,6 +8520,9 @@ msgstr "Typ"
 msgid "Constants"
 msgstr "Stałe"
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "wyświetl '+', jeśli przedrostek jest obcięty"
+
 #~ msgid "<nick> <channel>"
 #~ msgstr "<nick> <kanał>"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 75d9d154e..ffef889d3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2638,8 +2638,9 @@ msgstr "tamanho máximo para o prefixo (0 = sem tamanho máximo)"
 msgid "min size for prefix"
 msgstr "tamanho mínimo para o prefixo"
 
-msgid "display '+' if prefix is truncated"
-msgstr "mostra '+' se o prefixo está truncado"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
+msgstr ""
 
 msgid ""
 "prefix alignment for buffer name, when many buffers are merged with same "
@@ -2655,9 +2656,10 @@ msgstr ""
 "tamanho máximo para o nome do buffer, quando muitos buffers estão mesclados "
 "com o mesmo número (0 = sem tamanho máximo)"
 
+#, fuzzy
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 "mostra '+' se o nome do buffer está truncado (quando muitos buffers estão "
 "mesclados com o mesmo número)"
@@ -7987,5 +7989,8 @@ msgstr ""
 msgid "Constants"
 msgstr ""
 
+#~ msgid "display '+' if prefix is truncated"
+#~ msgstr "mostra '+' se o prefixo está truncado"
+
 #~ msgid "mechanism for SASL authentication"
 #~ msgstr "mecanismo para autenticação SASL"
diff --git a/po/ru.po b/po/ru.po
index 2074291e3..7c701bfe0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.8-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+0200\n"
 "PO-Revision-Date: 2012-02-26 09:16+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2231,7 +2231,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr "строка, вставляемая после автодополнения ника"
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -2245,8 +2246,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 27a841466..9f31dbb24 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-04-03 21:28+0200\n"
+"POT-Creation-Date: 2012-04-07 13:04+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"
@@ -1942,7 +1942,8 @@ msgstr ""
 msgid "min size for prefix"
 msgstr ""
 
-msgid "display '+' if prefix is truncated"
+msgid ""
+"char to display if prefix is truncated (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
@@ -1956,8 +1957,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"display '+' if buffer name is truncated (when many buffers are merged with "
-"same number)"
+"char to display if buffer name is truncated (when many buffers are merged "
+"with same number) (must be exactly one char on screen)"
 msgstr ""
 
 msgid ""
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 08e126da7..3a1ed8641 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -42,6 +42,7 @@
 #include "wee-hook.h"
 #include "wee-log.h"
 #include "wee-network.h"
+#include "wee-utf8.h"
 #include "wee-util.h"
 #include "wee-list.h"
 #include "wee-proxy.h"
@@ -564,6 +565,39 @@ config_change_prefix_align_min (void *data, struct t_config_option *option)
     gui_window_ask_refresh (1);
 }
 
+/*
+ * config_check_prefix_align_more: check string "prefix align more" (must be
+ *                                 max one char wide on screen)
+ */
+
+int
+config_check_prefix_align_more (void *data, struct t_config_option *option,
+                                const char *value)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    return (utf8_strlen_screen (value) == 1) ? 1 : 0;
+}
+
+/*
+ * config_check_prefix_buffer_align_more: check string "prefix buffer align more"
+ *                                        (must be max one char wide on screen)
+ */
+
+int
+config_check_prefix_buffer_align_more (void *data,
+                                       struct t_config_option *option,
+                                       const char *value)
+{
+    /* make C compiler happy */
+    (void) data;
+    (void) option;
+
+    return (utf8_strlen_screen (value) == 1) ? 1 : 0;
+}
+
 /*
  * config_change_color: called when a color is changed by /set command
  */
@@ -2069,9 +2103,11 @@ config_weechat_init_options ()
         NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_prefix_align_min, NULL, NULL, NULL);
     config_look_prefix_align_more = config_file_new_option (
         weechat_config_file, ptr_section,
-        "prefix_align_more", "boolean",
-        N_("display '+' if prefix is truncated"),
-        NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+        "prefix_align_more", "string",
+        N_("char to display if prefix is truncated (must be exactly one char "
+           "on screen)"),
+        NULL, 0, 0, "+", NULL, 0,
+        &config_check_prefix_align_more, 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",
@@ -2086,10 +2122,11 @@ config_weechat_init_options ()
         NULL, 0, 128, "0", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
     config_look_prefix_buffer_align_more = config_file_new_option (
         weechat_config_file, ptr_section,
-        "prefix_buffer_align_more", "boolean",
-        N_("display '+' if buffer name is truncated (when many buffers are "
-           "merged with same number)"),
-        NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL);
+        "prefix_buffer_align_more", "string",
+        N_("char to display if buffer name is truncated (when many buffers are "
+           "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_same_nick = config_file_new_option (
         weechat_config_file, ptr_section,
         "prefix_same_nick", "string",
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 509a6f406..2e6f88d7d 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -574,7 +574,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                  int *lines_displayed,
                                  int simulate)
 {
-    char str_space[] = " ", str_plus[] = "+";
+    char str_space[] = " ";
     char *prefix_no_color, *prefix_highlighted, *ptr_prefix, *ptr_prefix2;
     char *ptr_prefix_color;
     const char *short_name, *str_color;
@@ -702,8 +702,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                               GUI_COLOR_CHAT_PREFIX_MORE);
             }
             gui_chat_display_word (window, line,
-                                   (CONFIG_BOOLEAN(config_look_prefix_buffer_align_more)) ?
-                                   str_plus : str_space,
+                                   CONFIG_STRING(config_look_prefix_buffer_align_more),
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix_buffer));
@@ -903,8 +902,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window,
                                               GUI_COLOR_CHAT_PREFIX_MORE);
             }
             gui_chat_display_word (window, line,
-                                   (CONFIG_BOOLEAN(config_look_prefix_align_more)) ?
-                                   str_plus : str_space,
+                                   CONFIG_STRING(config_look_prefix_align_more),
                                    NULL, 1, num_lines, count, lines_displayed,
                                    simulate,
                                    CONFIG_BOOLEAN(config_look_color_inactive_prefix));