core: revert the rename of option weechat.look.save_layout_on_exit

23 files changed, 106 insertions, 112 deletions

diff --git a/ChangeLog b/ChangeLog
index 742cdb2f5..beed33271 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,8 +29,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * core: use "+" separator to make a logical "and" between tags in command
   /filter, option weechat.look.highlight_tags and buffer property
   "highlight_tags"
-* core: rename options save/reset to store/del in command /layout, rename
-  option weechat.look.save_layout_on_exit to weechat.look.store_layout_on_exit
+* core: rename options save/reset to store/del in command /layout
 * core: add options weechat.look.buffer_auto_renumber and
   weechat.look.buffer_position, add option "renumber" in command /buffer, add
   bar item "buffer_last_number" (task #12766)
diff --git a/NEWS b/NEWS
index 8f0d0dd9f..c95c16de9 100644
--- a/NEWS
+++ b/NEWS
@@ -13,11 +13,6 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 
 == Version 0.4.3 (under dev)
 
-=== Layout
-
-Option 'weechat.look.save_layout_on_exit' has been renamed to
-'weechat.look.store_layout_on_exit'.
-
 === Colors in messages
 
 The color code for "reverse video" in IRC message has been fixed: now WeeChat
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index f67425203..b1c89151b 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** Typ: boolesch
 ** Werte: on, off (Standardwert: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** Beschreibung: `save layout on exit (buffers, windows, or both)`
+** Typ: integer
+** Werte: none, buffers, windows, all (Standardwert: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** Beschreibung: `Anzahl der zu scrollenden Zeilen wenn seitenweise geblättert wird (Bild hoch/runter)`
 ** Typ: integer
@@ -833,11 +838,6 @@
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** Beschreibung: `store layout on exit (buffers, windows, or both)`
-** Typ: integer
-** Werte: none, buffers, windows, all (Standardwert: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** Beschreibung: `number of spaces used to display tabs in messages`
 ** Typ: integer
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 8a2776fcc..5c1b4e4ba 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** type: boolean
 ** values: on, off (default value: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** description: `save layout on exit (buffers, windows, or both)`
+** type: integer
+** values: none, buffers, windows, all (default value: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** description: `how many lines to scroll by with scroll_up and scroll_down`
 ** type: integer
@@ -833,11 +838,6 @@
 ** type: string
 ** values: any string (default value: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** description: `store layout on exit (buffers, windows, or both)`
-** type: integer
-** values: none, buffers, windows, all (default value: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** description: `number of spaces used to display tabs in messages`
 ** type: integer
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index b14c51fac..71d0fdeda 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** type: booléen
 ** valeurs: on, off (valeur par défaut: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** description: `sauvegarder la disposition en quittant (tampons, fenêtres, ou les deux)`
+** type: entier
+** valeurs: none, buffers, windows, all (valeur par défaut: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** description: `nombre de lignes pour le défilement avec scroll_up et scroll_down`
 ** type: entier
@@ -833,11 +838,6 @@
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** description: `stocker la disposition en quittant (tampons, fenêtres, ou les deux)`
-** type: entier
-** valeurs: none, buffers, windows, all (valeur par défaut: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** description: `nombre d'espaces utilisés pour afficher les tabulations dans les messages`
 ** type: entier
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 0f605808f..96c26d78e 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** tipo: bool
 ** valori: on, off (valore predefinito: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** descrizione: `save layout on exit (buffers, windows, or both)`
+** tipo: intero
+** valori: none, buffers, windows, all (valore predefinito: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** descrizione: `le righe da scorrere con scroll_up e scroll_down`
 ** tipo: intero
@@ -833,11 +838,6 @@
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** descrizione: `store layout on exit (buffers, windows, or both)`
-** tipo: intero
-** valori: none, buffers, windows, all (valore predefinito: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** descrizione: `number of spaces used to display tabs in messages`
 ** tipo: intero
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index f82f8fbaf..9d29741f6 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** タイプ: ブール
 ** 値: on, off (デフォルト値: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** 説明: `save layout on exit (buffers, windows, or both)`
+** タイプ: 整数
+** 値: none, buffers, windows, all (デフォルト値: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** 説明: `scroll_up と scroll_down でスクロールする行数`
 ** タイプ: 整数
@@ -833,11 +838,6 @@
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** 説明: `store layout on exit (buffers, windows, or both)`
-** タイプ: 整数
-** 値: none, buffers, windows, all (デフォルト値: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** 説明: `number of spaces used to display tabs in messages`
 ** タイプ: 整数
diff --git a/doc/pl/autogen/user/weechat_options.txt b/doc/pl/autogen/user/weechat_options.txt
index 9b7b735f0..f29f2e95a 100644
--- a/doc/pl/autogen/user/weechat_options.txt
+++ b/doc/pl/autogen/user/weechat_options.txt
@@ -803,6 +803,11 @@
 ** typ: bool
 ** wartości: on, off (domyślna wartość: `on`)
 
+* [[option_weechat.look.save_layout_on_exit]] *weechat.look.save_layout_on_exit*
+** opis: `save layout on exit (buffers, windows, or both)`
+** typ: liczba
+** wartości: none, buffers, windows, all (domyślna wartość: `none`)
+
 * [[option_weechat.look.scroll_amount]] *weechat.look.scroll_amount*
 ** opis: `ile linii przewijać za pomocą scroll_up i scroll_down`
 ** typ: liczba
@@ -833,11 +838,6 @@
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `""`)
 
-* [[option_weechat.look.store_layout_on_exit]] *weechat.look.store_layout_on_exit*
-** opis: `store layout on exit (buffers, windows, or both)`
-** typ: liczba
-** wartości: none, buffers, windows, all (domyślna wartość: `none`)
-
 * [[option_weechat.look.tab_width]] *weechat.look.tab_width*
 ** opis: `number of spaces used to display tabs in messages`
 ** typ: liczba
diff --git a/po/cs.po b/po/cs.po
index 57c88d497..ea71f1ba7 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:20+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3073,6 +3073,10 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "uložit soubor s nastavením při ukončení"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "uložit rozložení při ukončení (buffery, okna nebo obojí)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "o kolik řádů posunou pomocí scroll_up a scroll_down"
 
@@ -3114,10 +3118,6 @@ msgstr ""
 "povoleny"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "uložit rozložení při ukončení (buffery, okna nebo obojí)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "prefix pro zprávy akcí"
 
diff --git a/po/de.po b/po/de.po
index 5074d7a04..63eac89f2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.3-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:20+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -3562,6 +3562,12 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "die aktuelle Konfiguration wird beim Beenden automatisch gesichert"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr ""
+"beim Beenden wird das aktuelle Layout automatisch gesichert (Buffer, Fenster "
+"oder beides)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr ""
 "Anzahl der zu scrollenden Zeilen wenn seitenweise geblättert wird (Bild hoch/"
@@ -3609,12 +3615,6 @@ msgstr ""
 "Die Schriftbreite muss exakt ein Zeichen betragen"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr ""
-"beim Beenden wird das aktuelle Layout automatisch gesichert (Buffer, Fenster "
-"oder beides)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr ""
 "Lokalisation welche für die übersetzten Nachrichten verwendet werden soll"
diff --git a/po/es.po b/po/es.po
index 0c746f8f2..04fcd5fbb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:21+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3259,6 +3259,10 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "guardar archivo de configuración al salir"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "guardar esquema al salir (buffers, ventanas o ambos)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "cuántas líneas a desplazar con scroll_up y scroll_down"
 
@@ -3303,10 +3307,6 @@ msgstr ""
 "permitidos"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "guardar esquema al salir (buffers, ventanas o ambos)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "localización para traducción de mensajes"
 
diff --git a/po/fr.po b/po/fr.po
index e509b0945..59a6bcc3e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
-"PO-Revision-Date: 2014-01-22 15:41+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
+"PO-Revision-Date: 2014-01-22 18:47+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -3485,6 +3485,9 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "sauvegarder la configuration en quittant"
 
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "sauvegarder la disposition en quittant (tampons, fenêtres, ou les deux)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "nombre de lignes pour le défilement avec scroll_up et scroll_down"
 
@@ -3527,9 +3530,6 @@ msgstr ""
 "fenêtres (une valeur vide tracera une vraie ligne avec ncurses); la largeur "
 "à l'écran doit être exactement d'un caractère"
 
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "stocker la disposition en quittant (tampons, fenêtres, ou les deux)"
-
 msgid "number of spaces used to display tabs in messages"
 msgstr ""
 "nombre d'espaces utilisés pour afficher les tabulations dans les messages"
diff --git a/po/hu.po b/po/hu.po
index 19d274bc3..040f6f6f8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-06 10:16+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2680,6 +2680,9 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "beállítások mentése kilépéskor"
 
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr ""
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "a scroll_up és scroll_down hány sort görgessen"
 
@@ -2708,9 +2711,6 @@ msgid ""
 "will draw a real line with ncurses); width on screen must be exactly one char"
 msgstr ""
 
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr ""
-
 #, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "válasz ping üzenetre"
diff --git a/po/it.po b/po/it.po
index aba7bdba7..2b2c8f984 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:22+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3361,6 +3361,10 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "salva file di configurazione all'uscita"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "salva layout all'uscita (buffer, finestre, o entrambi)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "le righe da scorrere con scroll_up e scroll_down"
 
@@ -3405,10 +3409,6 @@ msgstr ""
 "caratteri wide qui NON sono consentiti"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "salva layout all'uscita (buffer, finestre, o entrambi)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "locale usato per la traduzione dei messaggi"
 
diff --git a/po/ja.po b/po/ja.po
index 22f3cda95..d4713ec56 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:22+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -3339,6 +3339,10 @@ msgstr "リードマーカー行の表示に使われる文字列 (行末まで�
 msgid "save configuration file on exit"
 msgstr "終了時に設定ファイルを保存"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "終了時にレイアウトを保存 (buffers、windows または both)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "scroll_up と scroll_down でスクロールする行数"
 
@@ -3379,10 +3383,6 @@ msgstr ""
 "クリーン上に描画した時の文字幅が 1 の文字を指定してください"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "終了時にレイアウトを保存 (buffers、windows または both)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "翻訳メッセージに利用するロケール"
 
diff --git a/po/pl.po b/po/pl.po
index 83312e9ab..fe97b7683 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:23+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3425,6 +3425,10 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "zapisz plik konfiguracyjny przy wyjściu"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "zapisz układ przy wyjściu (bufory, okna, lub oba)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "ile linii przewijać za pomocą scroll_up i scroll_down"
 
@@ -3468,10 +3472,6 @@ msgstr ""
 "szerokość na ekranie musi wynosić dokładnie jeden znak"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "zapisz układ przy wyjściu (bufory, okna, lub oba)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "zestaw znaków użyty do tłumaczenia wiadomości"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c2cc738c7..3bf8be576 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-18 21:23+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3162,6 +3162,10 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "salva arquivo de configuração na saída"
 
+#, fuzzy
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr "salva disposição na saída (buffers, janelas, ou ambos)"
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "quantas linhas rolar com scroll_up e scroll_down"
 
@@ -3202,10 +3206,6 @@ msgstr ""
 "extendidos NÃO são aceitos aqui"
 
 #, fuzzy
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr "salva disposição na saída (buffers, janelas, ou ambos)"
-
-#, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "prefixo para mensagens de ação"
 
diff --git a/po/ru.po b/po/ru.po
index 66fe91bfd..b0736157e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-06 10:17+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2712,6 +2712,9 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr "сохранять конфигурационный файл при выходе"
 
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr ""
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr "количество проматываемых кнопками PageUp и PageDown строк"
 
@@ -2740,9 +2743,6 @@ msgid ""
 "will draw a real line with ncurses); width on screen must be exactly one char"
 msgstr ""
 
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr ""
-
 #, fuzzy
 msgid "number of spaces used to display tabs in messages"
 msgstr "ответить на ping"
diff --git a/po/tr.po b/po/tr.po
index f5bee79aa..73612d7de 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\n"
 "PO-Revision-Date: 2014-01-06 10:17+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2420,6 +2420,9 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr ""
 
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr ""
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr ""
 
@@ -2448,9 +2451,6 @@ msgid ""
 "will draw a real line with ncurses); width on screen must be exactly one char"
 msgstr ""
 
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr ""
-
 msgid "number of spaces used to display tabs in messages"
 msgstr ""
 
diff --git a/po/weechat.pot b/po/weechat.pot
index db387075c..5e52699b6 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: 2014-01-22 15:40+0100\n"
+"POT-Creation-Date: 2014-01-22 18:47+0100\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"
@@ -2422,6 +2422,9 @@ msgstr ""
 msgid "save configuration file on exit"
 msgstr ""
 
+msgid "save layout on exit (buffers, windows, or both)"
+msgstr ""
+
 msgid "how many lines to scroll by with scroll_up and scroll_down"
 msgstr ""
 
@@ -2450,9 +2453,6 @@ msgid ""
 "will draw a real line with ncurses); width on screen must be exactly one char"
 msgstr ""
 
-msgid "store layout on exit (buffers, windows, or both)"
-msgstr ""
-
 msgid "number of spaces used to display tabs in messages"
 msgstr ""
 
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 61061fb3e..249fe48a3 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -159,13 +159,13 @@ struct t_config_option *config_look_read_marker;
 struct t_config_option *config_look_read_marker_always_show;
 struct t_config_option *config_look_read_marker_string;
 struct t_config_option *config_look_save_config_on_exit;
+struct t_config_option *config_look_save_layout_on_exit;
 struct t_config_option *config_look_scroll_amount;
 struct t_config_option *config_look_scroll_bottom_after_switch;
 struct t_config_option *config_look_scroll_page_percent;
 struct t_config_option *config_look_search_text_not_found_alert;
 struct t_config_option *config_look_separator_horizontal;
 struct t_config_option *config_look_separator_vertical;
-struct t_config_option *config_look_store_layout_on_exit;
 struct t_config_option *config_look_tab_width;
 struct t_config_option *config_look_time_format;
 struct t_config_option *config_look_window_auto_zoom;
@@ -2581,6 +2581,11 @@ config_weechat_init_options ()
         "save_config_on_exit", "boolean",
         N_("save configuration file on exit"),
         NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_save_config_on_exit, NULL, NULL, NULL);
+    config_look_save_layout_on_exit = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "save_layout_on_exit", "integer",
+        N_("save layout on exit (buffers, windows, or both)"),
+        "none|buffers|windows|all", 0, 0, "none", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_scroll_amount = config_file_new_option (
         weechat_config_file, ptr_section,
         "scroll_amount", "integer",
@@ -2622,11 +2627,6 @@ config_weechat_init_options ()
            "width on screen must be exactly one char"),
         NULL, 0, 0, "", NULL, 0,
         &config_check_separator, NULL, &config_change_buffers, NULL, NULL, NULL);
-    config_look_store_layout_on_exit = config_file_new_option (
-        weechat_config_file, ptr_section,
-        "store_layout_on_exit", "integer",
-        N_("store layout on exit (buffers, windows, or both)"),
-        "none|buffers|windows|all", 0, 0, "none", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_tab_width = config_file_new_option (
         weechat_config_file, ptr_section,
         "tab_width", "integer",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index e77578331..dc744a6dc 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -91,12 +91,12 @@ enum t_config_look_read_marker
     CONFIG_LOOK_READ_MARKER_CHAR,
 };
 
-enum t_config_look_store_layout_on_exit
+enum t_config_look_save_layout_on_exit
 {
-    CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_NONE = 0,
-    CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_BUFFERS,
-    CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_WINDOWS,
-    CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_ALL,
+    CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_NONE = 0,
+    CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_BUFFERS,
+    CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_WINDOWS,
+    CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_ALL,
 };
 
 extern struct t_config_file *weechat_config_file;
@@ -191,13 +191,13 @@ extern struct t_config_option *config_look_read_marker;
 extern struct t_config_option *config_look_read_marker_always_show;
 extern struct t_config_option *config_look_read_marker_string;
 extern struct t_config_option *config_look_save_config_on_exit;
+extern struct t_config_option *config_look_save_layout_on_exit;
 extern struct t_config_option *config_look_scroll_amount;
 extern struct t_config_option *config_look_scroll_bottom_after_switch;
 extern struct t_config_option *config_look_scroll_page_percent;
 extern struct t_config_option *config_look_search_text_not_found_alert;
 extern struct t_config_option *config_look_separator_horizontal;
 extern struct t_config_option *config_look_separator_vertical;
-extern struct t_config_option *config_look_store_layout_on_exit;
 extern struct t_config_option *config_look_tab_width;
 extern struct t_config_option *config_look_time_format;
 extern struct t_config_option *config_look_window_auto_zoom;
diff --git a/src/gui/gui-layout.c b/src/gui/gui-layout.c
index d8932a63b..4ca76d213 100644
--- a/src/gui/gui-layout.c
+++ b/src/gui/gui-layout.c
@@ -767,7 +767,7 @@ gui_layout_store_on_exit ()
 {
     struct t_gui_layout *ptr_layout;
 
-    if (CONFIG_BOOLEAN(config_look_store_layout_on_exit) == CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_NONE)
+    if (CONFIG_BOOLEAN(config_look_save_layout_on_exit) == CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_NONE)
         return;
 
     ptr_layout = gui_layout_current;
@@ -785,15 +785,15 @@ gui_layout_store_on_exit ()
     }
 
     /* store current layout */
-    switch (CONFIG_BOOLEAN(config_look_store_layout_on_exit))
+    switch (CONFIG_BOOLEAN(config_look_save_layout_on_exit))
     {
-        case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_BUFFERS:
+        case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_BUFFERS:
             gui_layout_buffer_store (ptr_layout);
             break;
-        case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_WINDOWS:
+        case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_WINDOWS:
             gui_layout_window_store (ptr_layout);
             break;
-        case CONFIG_LOOK_STORE_LAYOUT_ON_EXIT_ALL:
+        case CONFIG_LOOK_SAVE_LAYOUT_ON_EXIT_ALL:
             gui_layout_buffer_store (ptr_layout);
             gui_layout_window_store (ptr_layout);
             break;