diff --git a/ChangeLog b/ChangeLog
index bcb0366fa..412dbdb19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,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 add/del in command /layout
+* 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/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 5b8703ab4..28f594d1a 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -476,23 +476,23 @@ Beispiele:
 [command]*`layout`* Verwaltet Buffer/Fenster Layouts::
 
 ----
-/layout  add [<name>] [buffers|windows]
+/layout  store [<name>] [buffers|windows]
          apply [<name>] [buffers|windows]
          leave
          del [<name>] [buffers|windows]
          rename <name> <new_name>
 
-    add: erstellt ein Layout der zur Zeit verwendeten Buffer/Fenster
-  apply: das gespeicherte Layout anwenden
-  leave: belässt das aktuelle Layout (es wird kein Layout aktualisiert)
-    del: entfernt Buffer und/oder Fenster eines gesicherten Layouts
-         (falls weder "buffers" noch "windows" angegeben wird, dann wird das Layout entfernt)
- rename: ein Layout umbenennen
-   name: Name unter welchem das Layout gesichert werden soll (Standardlayout lautet "default")
-buffers: speichert bzw. verwendet nur Buffer (Reihenfolge der Buffer)
-windows: speichert bzw. verwendet nur Fenster (Buffer welche im jeweiligen Fenster dargestellt werden)
+  store: store current buffers/windows in a layout
+  apply: apply saved layout
+  leave: leave current layout (does not update any layout)
+    del: delete buffers and/or windows in a saved layout
+         (if neither "buffers" nor "windows" is given after the name, the layout is deleted)
+ rename: rename a layout
+   name: name for saved layout (default is "default")
+buffers: save/apply only buffers (order of buffers)
+windows: save/apply only windows (buffer displayed by each window)
 
-Wird der Befehl ohne Argumente aufgerufen wird das gespeicherte Layout dargestellt.
+Without argument, this command displays saved layouts.
 ----
 
 [[command_weechat_mouse]]
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index e14983a92..2cd0d742f 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -476,13 +476,13 @@ Examples:
 [command]*`layout`* manage buffers/windows layouts::
 
 ----
-/layout  add [<name>] [buffers|windows]
+/layout  store [<name>] [buffers|windows]
          apply [<name>] [buffers|windows]
          leave
          del [<name>] [buffers|windows]
          rename <name> <new_name>
 
-    add: create a layout using the current buffers/windows
+  store: store current buffers/windows in a layout
   apply: apply saved layout
   leave: leave current layout (does not update any layout)
     del: delete buffers and/or windows in a saved layout
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index b6b0c61f3..d8edb0d86 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -476,13 +476,13 @@ Exemples:
 [command]*`layout`* gestion des dispositions de tampons/fenêtres::
 
 ----
-/layout  add [<nom>] [buffers|windows]
+/layout  store [<nom>] [buffers|windows]
          apply [<nom>] [buffers|windows]
          leave
          del [<nom>] [buffers|windows]
          rename <nom> <nouveau_nom>
 
-    add: créer une disposition avec les tampons/fenêtres courants
+  store: stocker les tampons/fenêtres courants dans une disposition
   apply: appliquer une disposition sauvegardée
   leave: quitter la disposition courante (ne met à jour aucune disposition)
     del: supprimer les tampons et/ou fenêtres dans une disposition sauvegardée
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 509446615..b6e2201e3 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -476,13 +476,13 @@ Esempi:
 [command]*`layout`* manage buffers/windows layouts::
 
 ----
-/layout  add [<name>] [buffers|windows]
+/layout  store [<name>] [buffers|windows]
          apply [<name>] [buffers|windows]
          leave
          del [<name>] [buffers|windows]
          rename <name> <new_name>
 
-    add: create a layout using the current buffers/windows
+  store: store current buffers/windows in a layout
   apply: apply saved layout
   leave: leave current layout (does not update any layout)
     del: delete buffers and/or windows in a saved layout
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index b58303942..3065001d4 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -476,13 +476,13 @@ listdefault: デフォルトキーをリストアップ
 [command]*`layout`* manage buffers/windows layouts::
 
 ----
-/layout  add [<name>] [buffers|windows]
+/layout  store [<name>] [buffers|windows]
          apply [<name>] [buffers|windows]
          leave
          del [<name>] [buffers|windows]
          rename <name> <new_name>
 
-    add: create a layout using the current buffers/windows
+  store: store current buffers/windows in a layout
   apply: apply saved layout
   leave: leave current layout (does not update any layout)
     del: delete buffers and/or windows in a saved layout
diff --git a/doc/pl/autogen/user/weechat_commands.txt b/doc/pl/autogen/user/weechat_commands.txt
index 9e75652a4..c9eaf4a0a 100644
--- a/doc/pl/autogen/user/weechat_commands.txt
+++ b/doc/pl/autogen/user/weechat_commands.txt
@@ -476,22 +476,23 @@ Przykłady:
 [command]*`layout`* zarządzaj układami buforów/okien::
 
 ----
-/layout  add [<nazwa>] [buffers|windows]
-         apply [<nazwa>] [buffers|windows]|| leave
-         reset [<nazwa>] [buffers|windows]
-         rename <nazwa> <nowa_nazwa>
+/layout  store [<name>] [buffers|windows]
+         apply [<name>] [buffers|windows]
+         leave
+         del [<name>] [buffers|windows]
+         rename <name> <new_name>
 
-    add: tworzy układ używając obecnych buforów/okien
-  apply: stosuje zapisany układ
-  leave: opuszcza obecny układ (nie aktualizuje żadnego układu)
-  reset: resetuje bufory i/lub okna w zapisanym układzie
-         (jeśli zarówno bufory jak i okna zostaną zresetowane, układ jest kasowany)
- rename: zmienia nazwę układu
-   nazwa: nazwa zapisanego układu (domyślnie "default")
-buffers: zapisuje/stosuje tylko bufory (kolejność buforów)
-windows: zapisuje/stosuje tylko okna (bufory wyświetlane w każdym oknie)
+  store: store current buffers/windows in a layout
+  apply: apply saved layout
+  leave: leave current layout (does not update any layout)
+    del: delete buffers and/or windows in a saved layout
+         (if neither "buffers" nor "windows" is given after the name, the layout is deleted)
+ rename: rename a layout
+   name: name for saved layout (default is "default")
+buffers: save/apply only buffers (order of buffers)
+windows: save/apply only windows (buffer displayed by each window)
 
-Komenda wywołana bez argumentów wyświetli zapisane układy.
+Without argument, this command displays saved layouts.
 ----
 
 [[command_weechat_mouse]]
diff --git a/po/cs.po b/po/cs.po
index e36fa1631..c249b9635 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1728,14 +1728,14 @@ msgstr "řídit buffery"
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [buffers|windows] || apply [buffers|windows] || reset [buffers|windows]"
 
 #, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/de.po b/po/de.po
index 005b83e6f..8ee091435 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-21 16:44+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -1934,15 +1934,17 @@ msgstr ""
 msgid "manage buffers/windows layouts"
 msgstr "Verwaltet Buffer/Fenster Layouts"
 
+#, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
 "|| del [<name>] [buffers|windows] || rename <name> <new_name>"
 
+#, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/es.po b/po/es.po
index 6b8d440f7..14c4ead23 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1816,14 +1816,14 @@ msgstr "gestionar los buffers"
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [buffers|windows] || apply [buffers|windows] || reset [buffers|windows]"
 
 #, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/fr.po b/po/fr.po
index f33765ebc..a13d8c6a5 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: 2013-12-24 00:03+0100\n"
-"PO-Revision-Date: 2013-12-24 00:04+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
+"PO-Revision-Date: 2013-12-30 14:59+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1888,14 +1888,14 @@ msgid "manage buffers/windows layouts"
 msgstr "gestion des dispositions de tampons/fenêtres"
 
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
-"add [<nom>] [buffers|windows] || apply [<nom>] [buffers|windows] || leave || "
-"del [<nom>] [buffers|windows] || rename <nom> <nouveau_nom>"
+"store [<nom>] [buffers|windows] || apply [<nom>] [buffers|windows] || leave "
+"|| del [<nom>] [buffers|windows] || rename <nom> <nouveau_nom>"
 
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
@@ -1908,7 +1908,7 @@ msgid ""
 "\n"
 "Without argument, this command displays saved layouts."
 msgstr ""
-"    add: créer une disposition avec les tampons/fenêtres courants\n"
+"  store: stocker les tampons/fenêtres courants dans une disposition\n"
 "  apply: appliquer une disposition sauvegardée\n"
 "  leave: quitter la disposition courante (ne met à jour aucune disposition)\n"
 "    del: supprimer les tampons et/ou fenêtres dans une disposition "
diff --git a/po/hu.po b/po/hu.po
index d969b4e58..ede172bdc 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1535,12 +1535,12 @@ msgid "manage buffers/windows layouts"
 msgstr "pufferek kezelése"
 
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/it.po b/po/it.po
index b640c8ca2..b95400756 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1849,15 +1849,15 @@ msgstr "gestione dei buffer"
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [<nome>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
 "|| reset [<nome>] [buffers|windows] || rename <nome> <nuovo_nome>"
 
 #, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/ja.po b/po/ja.po
index b1f98a52b..387dc0584 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:39+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -1830,15 +1830,15 @@ msgstr "バッファの管理"
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
 "|| reset [<name>] [buffers|windows] || rename <name> <new_name>"
 
 #, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/pl.po b/po/pl.po
index 83f9d041b..ab268ce83 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-23 18:53+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1880,15 +1880,17 @@ msgstr ""
 msgid "manage buffers/windows layouts"
 msgstr "zarządzaj układami buforów/okien"
 
+#, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "add [<nazwa>] [buffers|windows] || apply [<nazwa>] [buffers|windows]|| leave "
 "|| reset [<nazwa>] [buffers|windows] || rename <nazwa> <nowa_nazwa>"
 
+#, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8fe2100a1..13fa213e9 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:40+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1792,15 +1792,15 @@ msgstr "gerenciar buffers"
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [<nome>] [buffers|windows] || apply [<nome>] [buffers|windows] || leave "
 "|| reset [<nome>] [buffers|windows] || rename <nome> <novo_nome>"
 
 #, fuzzy
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/ru.po b/po/ru.po
index 09245c232..551f0cde5 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-12-15 14:40+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1558,12 +1558,12 @@ msgid "manage buffers/windows layouts"
 msgstr "управление буферами"
 
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/tr.po b/po/tr.po
index 276e3a7b2..d7792c33e 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: 2013-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+0100\n"
 "PO-Revision-Date: 2013-11-09 10:13+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1383,14 +1383,14 @@ msgstr ""
 
 #, fuzzy
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 "save [<isim>] [buffers|windows] || apply [<isim>] [buffers|windows] || leave "
 "|| reset [<isim>] [buffers|windows] || rename <isim> <yeni_isim>"
 
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index 1a74c9859..19b902086 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-12-24 00:03+0100\n"
+"POT-Creation-Date: 2013-12-30 14:58+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"
@@ -1388,12 +1388,12 @@ msgid "manage buffers/windows layouts"
 msgstr ""
 
 msgid ""
-"add [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || leave "
-"|| del [<name>] [buffers|windows] || rename <name> <new_name>"
+"store [<name>] [buffers|windows] || apply [<name>] [buffers|windows] || "
+"leave || del [<name>] [buffers|windows] || rename <name> <new_name>"
 msgstr ""
 
 msgid ""
-"    add: create a layout using the current buffers/windows\n"
+"  store: store current buffers/windows in a layout\n"
 "  apply: apply saved layout\n"
 "  leave: leave current layout (does not update any layout)\n"
 "    del: delete buffers and/or windows in a saved layout\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index c7bf98bed..6251649e3 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -3350,7 +3350,7 @@ command_layout_display_tree (struct t_gui_layout_window *layout_window,
 }
 
 /*
- * Gets arguments for /layout command (if option is add/apply/del).
+ * Gets arguments for /layout command (if option is store/apply/del).
  */
 
 void
@@ -3438,8 +3438,8 @@ COMMAND_CALLBACK(layout)
         return WEECHAT_RC_OK;
     }
 
-    /* add a layout */
-    if (string_strcasecmp (argv[1], "add") == 0)
+    /* store in a layout */
+    if (string_strcasecmp (argv[1], "store") == 0)
     {
         command_layout_get_arguments (argc, argv, &layout_name, &ptr_layout,
                                       &flag_buffers, &flag_windows);
@@ -6835,12 +6835,12 @@ command_init ()
                   &command_key, NULL);
     hook_command (NULL, "layout",
                   N_("manage buffers/windows layouts"),
-                  N_("add [<name>] [buffers|windows]"
+                  N_("store [<name>] [buffers|windows]"
                      " || apply [<name>] [buffers|windows]"
                      " || leave"
                      " || del [<name>] [buffers|windows]"
                      " || rename <name> <new_name>"),
-                  N_("    add: create a layout using the current buffers/windows\n"
+                  N_("  store: store current buffers/windows in a layout\n"
                      "  apply: apply saved layout\n"
                      "  leave: leave current layout (does not update any layout)\n"
                      "    del: delete buffers and/or windows in a saved layout\n"
@@ -6852,7 +6852,7 @@ command_init ()
                      "windows: save/apply only windows (buffer displayed by "
                      "each window)\n\n"
                      "Without argument, this command displays saved layouts."),
-                  "add %(layouts_names)|buffers|windows buffers|windows"
+                  "store %(layouts_names)|buffers|windows buffers|windows"
                   " || apply %(layouts_names)|buffers|windows buffers|windows"
                   " || leave"
                   " || del %(layouts_names)|buffers|windows buffers|windows"