Update translations.

author: Andrei Karas <akaras@inbox.ru> 2016-01-08 23:23:39 +0300
committer: Andrei Karas <akaras@inbox.ru> 2016-01-08 23:23:39 +0300
commit: a640418f26f4fd38fe55671120dd643f30d52273 (patch)
tree: 1e0564349b5afc2e6b3114d4c4cb541084c62ade
parent: c74a91d49f6afea0b23acc4d5b4543dfee5e64db (diff)
download: mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.gz
mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.bz2
mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.xz
mv-a640418f26f4fd38fe55671120dd643f30d52273.zip
43 files changed, 5913 insertions, 5674 deletions
diff --git a/data/translations/help/cs.po b/data/translations/help/cs.po
index e7260c27b..a3bbf9839 100644
--- a/data/translations/help/cs.po
+++ b/data/translations/help/cs.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -301,6 +301,9 @@ msgstr "\"Nastavit směr vlevo\""
 msgid "\"Equipment window\""
 msgstr "\"Okno výbavy\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -537,6 +540,9 @@ msgstr "\"Předchozí záložka chatu\""
 msgid "\"Kills stats window\""
 msgstr "\"Okno statistik zabití\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Zkratka výbavy  2\""
 
diff --git a/data/translations/help/de.po b/data/translations/help/de.po
index 66039f673..9c48b2d5b 100644
--- a/data/translations/help/de.po
+++ b/data/translations/help/de.po
@@ -18,7 +18,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-01-03 16:51+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -314,6 +314,9 @@ msgstr "\"Linke Richtung setzen\""
 msgid "\"Equipment window\""
 msgstr "\"Fenster: Ausrüstung\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -550,6 +553,9 @@ msgstr "\"Vorheriger Chatreiter\""
 msgid "\"Kills stats window\""
 msgstr "\"Fenster: Tötungsstatistik\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Kurzbefehl Ausrüstungset 2\""
 
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index c3d042b44..e2e8af5e0 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -10,9 +10,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-04-06 16:14+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/language/es/)\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -306,6 +306,9 @@ msgstr "\"Voltear a la izquierda\""
 msgid "\"Equipment window\""
 msgstr "\"Ventana de Equipamiento\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -542,6 +545,9 @@ msgstr "\"Pestaña previa del chat\""
 msgid "\"Kills stats window\""
 msgstr "\"Ventana de estadisticas de matanzas\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Atajo para vestimenta 2\""
 
diff --git a/data/translations/help/fr.po b/data/translations/help/fr.po
index ad64d893a..2ad4bdfbd 100644
--- a/data/translations/help/fr.po
+++ b/data/translations/help/fr.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-01-03 16:52+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -307,6 +307,9 @@ msgstr "\"Définir la direction vers la gauche\""
 msgid "\"Equipment window\""
 msgstr "\"Fenêtre d'équipement\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -543,6 +546,9 @@ msgstr "\"Onglet de conversation précédent\""
 msgid "\"Kills stats window\""
 msgstr "\"Fenêtre des statistiques de combat\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Raccourci de tenue 2\""
 
diff --git a/data/translations/help/id.po b/data/translations/help/id.po
index baf48b2dd..cbeed1432 100644
--- a/data/translations/help/id.po
+++ b/data/translations/help/id.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -302,6 +302,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -538,6 +541,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/it.po b/data/translations/help/it.po
index e7905b557..73720175f 100644
--- a/data/translations/help/it.po
+++ b/data/translations/help/it.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -305,6 +305,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -541,6 +544,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/ja.po b/data/translations/help/ja.po
index 69bf558b7..c77f0ef2b 100644
--- a/data/translations/help/ja.po
+++ b/data/translations/help/ja.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,6 +299,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -535,6 +538,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/nl.po b/data/translations/help/nl.po
index a928be2ed..f81fa4c3d 100644
--- a/data/translations/help/nl.po
+++ b/data/translations/help/nl.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -302,6 +302,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -538,6 +541,9 @@ msgstr "\"Vorige gesprekstab\""
 msgid "\"Kills stats window\""
 msgstr "\"Doodstatusvenster\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/nl_BE.po b/data/translations/help/nl_BE.po
index a928be2ed..f81fa4c3d 100644
--- a/data/translations/help/nl_BE.po
+++ b/data/translations/help/nl_BE.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -302,6 +302,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -538,6 +541,9 @@ msgstr "\"Vorige gesprekstab\""
 msgid "\"Kills stats window\""
 msgstr "\"Doodstatusvenster\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/pl.po b/data/translations/help/pl.po
index 8b58ea4ad..143382fcb 100644
--- a/data/translations/help/pl.po
+++ b/data/translations/help/pl.po
@@ -9,9 +9,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-03-01 13:02+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -305,6 +305,9 @@ msgstr "\"Ustaw w prawy kierunek\""
 msgid "\"Equipment window\""
 msgstr "\"Okno Ekwipunku\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -541,6 +544,9 @@ msgstr "\"Poprzednia zakładka czatu\""
 msgid "\"Kills stats window\""
 msgstr "\"Okno statystyk bitewnych\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Skrót ubioru 2\""
 
diff --git a/data/translations/help/pt_BR.po b/data/translations/help/pt_BR.po
index aa6d73908..12abdd2e9 100644
--- a/data/translations/help/pt_BR.po
+++ b/data/translations/help/pt_BR.po
@@ -12,9 +12,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-14 14:30+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/manaplus/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -308,6 +308,9 @@ msgstr "\"Define direção para esquerda\""
 msgid "\"Equipment window\""
 msgstr "\"Janela Equipamento\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -544,6 +547,9 @@ msgstr "\"Aba de chat anterior\""
 msgid "\"Kills stats window\""
 msgstr "\"Janela de estatísticas de mortes\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Atalho de roupa 2\""
 
diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po
index 7dae1f3da..31fc2b70e 100644
--- a/data/translations/help/ru.po
+++ b/data/translations/help/ru.po
@@ -3,7 +3,7 @@
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2012
 # Alexsl <alexlsh@mail.ru>, 2014
 # Alexsl <alexlsh@mail.ru>, 2014
-# Andrei Karas <akaras@inbox.ru>, 2012-2015
+# Andrei Karas <akaras@inbox.ru>, 2012-2016
 # vislav <bizadmin@list.ru>, 2015
 # BoBaH <BoBaH4spam@ukr.net>, 2012
 # BoBaH <BoBaH4spam@ukr.net>, 2012
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-01-03 16:53+0000\n"
+"PO-Revision-Date: 2016-01-04 17:37+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -315,6 +315,9 @@ msgstr "\"Установить направление влево\""
 msgid "\"Equipment window\""
 msgstr "\"Окно экипировки\""
 
+msgid "Chrome store"
+msgstr "Магазин chrome"
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -551,6 +554,9 @@ msgstr "\"Предыдущая закладка чата\""
 msgid "\"Kills stats window\""
 msgstr "\"Окно статистики атак\""
 
+msgid "Chrome (nacl) porting"
+msgstr "Портирование на chrome (nacl)"
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Наряд 2\""
 
diff --git a/data/translations/help/sr.po b/data/translations/help/sr.po
index f9e05b348..65409b740 100644
--- a/data/translations/help/sr.po
+++ b/data/translations/help/sr.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/manaplus/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -301,6 +301,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -537,6 +540,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/sv_SE.po b/data/translations/help/sv_SE.po
index d36cecf0b..1d121acac 100644
--- a/data/translations/help/sv_SE.po
+++ b/data/translations/help/sv_SE.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,6 +299,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -535,6 +538,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/tr.po b/data/translations/help/tr.po
index 682703798..fa83d96be 100644
--- a/data/translations/help/tr.po
+++ b/data/translations/help/tr.po
@@ -5,9 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -301,6 +301,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -537,6 +540,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/uk.po b/data/translations/help/uk.po
index 94a846a1e..d1f006ad5 100644
--- a/data/translations/help/uk.po
+++ b/data/translations/help/uk.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,6 +299,9 @@ msgstr "\"Встановити напрямок ліворуч\""
 msgid "\"Equipment window\""
 msgstr "\"Вікно спорядження\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -535,6 +538,9 @@ msgstr "\"Попередня вкладка балачки\""
 msgid "\"Kills stats window\""
 msgstr "\"Вікно статистики атак\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"Спорядження 2\""
 
diff --git a/data/translations/help/zh_CN.po b/data/translations/help/zh_CN.po
index 6f96c89fd..a6f029171 100644
--- a/data/translations/help/zh_CN.po
+++ b/data/translations/help/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2016-01-02 11:55+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -305,6 +305,9 @@ msgstr "\"设置左方\""
 msgid "\"Equipment window\""
 msgstr "\"装备窗口\""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -541,6 +544,9 @@ msgstr "\"上一个标签页\""
 msgid "\"Kills stats window\""
 msgstr "\"击杀状态窗口\""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr "\"装备快捷键2\""
 
diff --git a/data/translations/help/zh_HK.po b/data/translations/help/zh_HK.po
index d8420ebd8..d5466218f 100644
--- a/data/translations/help/zh_HK.po
+++ b/data/translations/help/zh_HK.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,6 +299,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -535,6 +538,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/data/translations/help/zh_TW.po b/data/translations/help/zh_TW.po
index ec8977b50..2399de111 100644
--- a/data/translations/help/zh_TW.po
+++ b/data/translations/help/zh_TW.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2015-02-08 11:59+0000\n"
+"PO-Revision-Date: 2016-01-04 17:36+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/akaras/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,6 +299,9 @@ msgstr ""
 msgid "\"Equipment window\""
 msgstr ""
 
+msgid "Chrome store"
+msgstr ""
+
 msgid ""
 " To add an item to the shortcut bar click on the item in the inventory window,\n"
 " then click on the box in the shortcut-window which should be associated with\n"
@@ -535,6 +538,9 @@ msgstr ""
 msgid "\"Kills stats window\""
 msgstr ""
 
+msgid "Chrome (nacl) porting"
+msgstr ""
+
 msgid "\"Outfit shortcut 2\""
 msgstr ""
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2b9311c90..6c36ec455 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -138,7 +138,6 @@ src/input/pages/other.cpp
 src/input/pages/outfits.cpp
 src/input/pages/shortcuts.cpp
 src/input/pages/windows.cpp
-src/inventory.cpp
 src/localconsts.h
 src/logger.h
 src/net/ea/charserverrecv.cpp
@@ -175,6 +174,7 @@ src/resources/db/monsterdb.cpp
 src/resources/db/npcdb.cpp
 src/resources/db/petdb.cpp
 src/resources/db/skillunitdb.cpp
+src/resources/inventory/inventory.cpp
 src/resources/itemtypemapdata.h
 src/resources/mapreader.cpp
 src/resources/modinfo.cpp
diff --git a/po/ca.po b/po/ca.po
index 4f7f50937..96d586b50 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -50,7 +50,7 @@ msgstr "Arxiu enviat"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -62,43 +62,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
@@ -130,7 +130,7 @@ msgstr "Falta el nom del gremi."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Si us plau especifica un nom."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "El jugador ja és %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Relació canviada amb èxit, el jugador es ara %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "El jugador no pot ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estava ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "El jugador ja no està ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "El jugador no pot ser des-ignorat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Personatge ja esborrat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "El personatge no pot ser esborrat!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amic"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "desatès"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -417,8 +417,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -503,12 +503,12 @@ msgstr "Ajuda"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tancar"
 
@@ -1212,7 +1212,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1727,22 +1727,22 @@ msgstr "Crear grup"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1772,7 +1772,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Intercanvi"
 
@@ -1875,10 +1876,10 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
@@ -1893,10 +1894,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendre"
@@ -1906,7 +1907,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1932,7 +1933,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1973,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1990,7 +1991,7 @@ msgstr "Des-equipar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
@@ -2016,8 +2017,8 @@ msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr ""
 
@@ -2029,8 +2030,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
@@ -2045,8 +2046,8 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr ""
 
@@ -2070,8 +2071,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Conjunt"
 
@@ -2096,7 +2097,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Netejar"
 
@@ -2149,8 +2150,8 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2160,73 +2161,73 @@ msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nom:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -2235,66 +2236,66 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Botiga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -2305,9 +2306,9 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2315,46 +2316,46 @@ msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr ""
 
@@ -2362,30 +2363,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2393,8 +2394,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2402,134 +2403,134 @@ msgstr "Nivell: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr ""
 
@@ -2537,60 +2538,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2938,14 +2939,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Diners: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2961,8 +2962,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Afegeix"
@@ -2988,8 +2989,8 @@ msgstr "Sortir"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3000,8 +3001,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4494,7 +4495,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Botiga"
 
@@ -4510,7 +4511,7 @@ msgstr "Permet mode botiga"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4937,7 +4938,7 @@ msgstr "Permet xiuxiueigs"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Esborra"
@@ -5603,7 +5604,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipament"
 
@@ -5615,8 +5616,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventari"
 
@@ -5628,8 +5629,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Motxilla"
 
@@ -5725,7 +5726,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5746,8 +5747,8 @@ msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Clau: %s"
@@ -5896,7 +5897,7 @@ msgstr "Nom:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5907,7 +5908,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5960,7 +5961,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6236,7 +6237,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6248,88 +6249,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Tot"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecciona la quantitat d'objectes per intercanviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Selecciona la quantitat d'objectes per deixar caure."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Selecciona la quantitat d'objectes per guardar emmagatzemar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Selecciona la quantitat d'objectes per recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Selecciona la quantitat d'objectes per dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Afegir a la botiga \"comprar\"."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Afegir a la botiga \"vendre\"."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Desconegut."
 
@@ -6564,87 +6565,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de vida"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra de mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Barra d'experiència"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Barra de pes"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "Barra de ranures d'inventari"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Barra de diners"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "Barra de fletxes"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Barra d'estatus"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Barra de treball"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivell: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Necessites"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Nivell de treball: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Següent"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Envia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Reajustar"
 
@@ -6660,18 +6661,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Conjunt: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Des-equipar abans"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Conjunt d'ausent"
 
@@ -6812,72 +6813,72 @@ msgid "Reset Windows"
 msgstr "Restaurar finestres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Botiga personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Anunciar"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Mostra enllaços al anunci"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s vol %s %s acceptes?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s vol %s %s acceptes?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8434,16 +8435,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Emmagatzematge"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9041,9 +9032,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Nivell de treball: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9439,6 +9430,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Emmagatzematge"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/cs.po b/po/cs.po
index 20d1e7c2b..7f1c9e73f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 16:55+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
@@ -55,7 +55,7 @@ msgstr "Soubor byl uploadován"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -67,43 +67,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
@@ -134,7 +134,7 @@ msgstr "Chybí jméno gildy."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hráč nemůže být zařazen jako %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Hráč již není smazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "přítel"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "přehlížený"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutrální"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "na černé listině"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "nepřítel"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -422,8 +422,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -508,12 +508,12 @@ msgstr "Nápověda"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
@@ -1218,7 +1218,7 @@ msgstr "Zpráva"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Oživ"
 
@@ -1403,8 +1403,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1734,22 +1734,22 @@ msgstr "Vytvořit partu"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1779,7 +1779,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Obchod"
 
@@ -1882,10 +1883,10 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Nákup"
@@ -1900,10 +1901,10 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Prodej"
@@ -1913,7 +1914,7 @@ msgstr "Prodej"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Přidat komentář"
 
@@ -1939,7 +1940,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -1980,7 +1981,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1997,7 +1998,7 @@ msgstr "Odebrat z vybavení"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -2023,8 +2024,8 @@ msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
@@ -2036,8 +2037,8 @@ msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
@@ -2052,8 +2053,8 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -2077,8 +2078,8 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Výstroje"
 
@@ -2103,7 +2104,7 @@ msgstr "Upravit kouzlo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Vymazat"
 
@@ -2156,8 +2157,8 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
@@ -2167,73 +2168,73 @@ msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -2242,66 +2243,66 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2312,9 +2313,9 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2322,46 +2323,46 @@ msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2369,30 +2370,30 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Zobrazit okno"
 
@@ -2400,8 +2401,8 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2409,134 +2410,134 @@ msgstr "Úroveň: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2544,60 +2545,60 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2945,14 +2946,14 @@ msgstr "Úroveň: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Ob."
 
@@ -2968,8 +2969,8 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Přidat"
@@ -2995,8 +2996,8 @@ msgstr "Ukončit"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3007,8 +3008,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4501,7 +4502,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Obchod"
 
@@ -4517,7 +4518,7 @@ msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4951,7 +4952,7 @@ msgstr "Povolit šeptání"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Smazat"
@@ -5615,7 +5616,7 @@ msgstr "VYB"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -5627,8 +5628,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventář"
 
@@ -5640,8 +5641,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Košík"
 
@@ -5737,7 +5738,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5758,8 +5759,8 @@ msgstr "NAS"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Klávesa: %s"
@@ -5908,7 +5909,7 @@ msgstr "Jméno:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5919,7 +5920,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5972,7 +5973,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6253,7 +6254,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6265,88 +6266,88 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Vše"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Vyberte množství předmětů, se kterými budete obchodovat."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Vyberte množství předmětů, které chcete upustit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Vyberte množství předmětů, které chcete uskladnit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Vyberte množství předmětů, které chcete obdržet."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Vyberte množství předmětů, které chcete rozdělit."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Přidat k nákupu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Přidat k prodeji."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Neznámý."
 
@@ -6583,87 +6584,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "pruh zdraví"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "pruh many"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "pruh zkušeností"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "pruh váhy"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "pruh míst v inventáři"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "pruh peněz"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "pruh šípů"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "stavový řádek"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "pruh práce"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Potřebuješ"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Prácovní úroveň: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Zastavit čekání"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Resetovat"
 
@@ -6679,18 +6680,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Opravdu chceš prodat %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Výstroj: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Nejdřív odstrojit"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Výstroj pro \"Away\""
 
@@ -6831,72 +6832,72 @@ msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Oznámit"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Zobrazit odkazy v oznámení"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s chce %s %s příjímáte?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s chce %s %s příjímáte?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8453,16 +8454,6 @@ msgstr "Další záložka inventáře"
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Sklad"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9064,9 +9055,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Úroveň gildy: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9462,6 +9453,21 @@ msgstr "mazlíček"
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Sklad"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -9873,9 +9879,8 @@ msgstr "Pokus o polapení mazíčka selhal."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Mazlíček byl polapen."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/de.po b/po/de.po
index a2bf8f48b..abcd466cf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,9 +34,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 16:54+0000\n"
-"Last-Translator: Valsu <valsu@hylia.de>\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -75,7 +75,7 @@ msgstr "Datei hochgeladen"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -87,43 +87,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
@@ -156,7 +156,7 @@ msgstr "Name der Gilde fehlt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
@@ -186,91 +186,91 @@ msgid "equipped hat %s."
 msgstr "Hut %s angezogen."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Spieler ist nicht mehr gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "Freund"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "missachtet"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "Feind"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr "Schnellnachricht"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "Konfigurationswert: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "Konfigurationswert des Servers: %s"
@@ -443,8 +443,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -529,12 +529,12 @@ msgstr "Hilfe"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
@@ -1243,7 +1243,7 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Wiederbeleben"
 
@@ -1431,8 +1431,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1762,22 +1762,22 @@ msgstr "Gruppe erstellen"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1807,7 +1807,8 @@ msgstr "Karten: "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Handeln"
 
@@ -1910,10 +1911,10 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kaufen"
@@ -1928,10 +1929,10 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkaufen"
@@ -1941,7 +1942,7 @@ msgstr "Verkaufen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -1967,7 +1968,7 @@ msgstr "Zur Angriffsliste hinzufügen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
@@ -2008,7 +2009,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2025,7 +2026,7 @@ msgstr "Ablegen"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -2051,8 +2052,8 @@ msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
@@ -2064,8 +2065,8 @@ msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
@@ -2080,8 +2081,8 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2105,8 +2106,8 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Ausrüstungset"
 
@@ -2131,7 +2132,7 @@ msgstr "Zauberspruch bearbeiten"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Leeren"
 
@@ -2184,8 +2185,8 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
@@ -2195,73 +2196,73 @@ msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "Fenster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Entsperren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Sperren"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Name:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Alles -1 zum Handel hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -2270,66 +2271,66 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Alles -1 ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Alles -1 aufnehmen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2340,9 +2341,9 @@ msgstr "Alles abholen"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2350,46 +2351,46 @@ msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Gelben Balken zurücksetzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2397,30 +2398,30 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
@@ -2428,8 +2429,8 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2437,134 +2438,134 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2572,60 +2573,60 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
@@ -2973,14 +2974,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2996,8 +2997,8 @@ msgstr "URL öffnen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Hinzufügen"
@@ -3023,8 +3024,8 @@ msgstr "Beenden"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3035,8 +3036,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4663,7 +4664,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Laden"
 
@@ -4679,7 +4680,7 @@ msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -5115,7 +5116,7 @@ msgstr "Flüstern erlauben"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Löschen"
@@ -5784,7 +5785,7 @@ msgstr "AUS"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -5796,8 +5797,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -5809,8 +5810,8 @@ msgstr "EK"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Einkaufswagen"
 
@@ -5906,7 +5907,7 @@ msgstr "NA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr "Nachricht"
 
@@ -5927,8 +5928,8 @@ msgstr "EINST"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Taste: %s"
@@ -6077,7 +6078,7 @@ msgstr "Name:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6088,7 +6089,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6141,7 +6142,7 @@ msgstr "M"
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr "O"
 
@@ -6422,7 +6423,7 @@ msgstr "Einfügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6434,88 +6435,88 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Anzahl der Gegenstände zum Handeln auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Anzahl der Gegenstände zum Wegwerfen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Anzahl der Gegenstände zum Aufbewaren auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr "Anzahl der Gegenstände zum Senden auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr "Anzahl der Gegenstände vom Stand zum Einkaufswagen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Anzahl der Gegenstände zum Abholen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr "Anzahl der Gegenstände zum Abholen vom Einkaufswagen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Anzahl der Gegenstände zum Aufteilen auswählen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Zum Einkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Zum Verkaufsstand hinzufügen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Unbekannt."
 
@@ -6750,87 +6751,87 @@ msgid "Open"
 msgstr "Öffnen"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Balken: Gesundheit"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Balken: Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Balken: Erfahrung"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Balken: Gewicht"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "Balken: Inventarplätze"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Balken: Geld"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "Balken: Pfeile"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Balken: Status"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Balken: Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Verbleibend"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Job Level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Warten stoppen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Absenden"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -6846,18 +6847,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Möchtest du wirklich %s verkaufen?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Ausrüstungset: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Zuerst ausziehen"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Abwesendheits-Ausrüstungset"
 
@@ -6998,73 +6999,72 @@ msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Persönlicher Stand"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr "Veröffentlichen"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Ankündigen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Links in Ankündigungen anzeigen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr "Bitte neuen Namen für den Stand eingeben"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr "Verstecke"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Spieler nach oben bewegen"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s möchte %s %s akzeptierst du?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s möchte %s %s akzeptierst du?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel anfordern"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
@@ -8621,16 +8621,6 @@ msgstr "Nächster Inventarreiter"
 msgid "Clear drops window"
 msgstr "Fenster: Wegwerfen leeren"
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Lager"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr "NPC"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9235,9 +9225,9 @@ msgstr "Du hast eine neue Nachricht von %s mit dem Betreff %s"
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Gilden Level: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9633,6 +9623,21 @@ msgstr "Haustier"
 msgid "skill"
 msgstr "Fähigkeit"
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Lager"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr "NPC"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -10050,9 +10055,8 @@ msgstr "Haustierfang fehlgeschlagen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Haustier gefangen."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/es.po b/po/es.po
index fb3f47dc4..b8c9f20d5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 16:56+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
@@ -62,7 +62,7 @@ msgstr "Archivo subido"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -74,43 +74,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
@@ -142,7 +142,7 @@ msgstr "Falta el nombre del gremio."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
@@ -172,91 +172,91 @@ msgid "equipped hat %s."
 msgstr "tiene puesto el sombrero %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Relación cambiada exitosamente! ¡El jugador ahora es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "¡El jugador no fue ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "¡El jugador ya no se encuentra borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "desatendido"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "en la lista negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr "Mensaje rápido"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "Valor de configuración: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "Valor de configuración del servidor: %s"
@@ -429,8 +429,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -515,12 +515,12 @@ msgstr "Ayuda"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1227,7 +1227,7 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Revivir"
 
@@ -1414,8 +1414,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1745,22 +1745,22 @@ msgstr "Crear grupo"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1790,7 +1790,8 @@ msgstr "Tarjetas: "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Intercambio"
 
@@ -1893,10 +1894,10 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
@@ -1911,10 +1912,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
@@ -1924,7 +1925,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Agregar comentario"
 
@@ -1950,7 +1951,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -1991,7 +1992,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2008,7 +2009,7 @@ msgstr "Quitárselo"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -2034,8 +2035,8 @@ msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
@@ -2047,8 +2048,8 @@ msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -2063,8 +2064,8 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Quitar"
 
@@ -2088,8 +2089,8 @@ msgstr "Mover cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Vestimenta"
 
@@ -2114,7 +2115,7 @@ msgstr "Editar hechizo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -2167,8 +2168,8 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
@@ -2178,73 +2179,73 @@ msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -2253,66 +2254,66 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2323,9 +2324,9 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2333,46 +2334,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2380,30 +2381,30 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Mostrar ventana"
 
@@ -2411,8 +2412,8 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2420,134 +2421,134 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2555,60 +2556,60 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
@@ -2956,14 +2957,14 @@ msgstr "Nivel: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2979,8 +2980,8 @@ msgstr "Abrir url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Añadir"
@@ -3006,8 +3007,8 @@ msgstr "Salir"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3018,8 +3019,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4545,7 +4546,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Tienda"
 
@@ -4561,7 +4562,7 @@ msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4995,7 +4996,7 @@ msgstr "Permitir mensajes privados"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Borrar"
@@ -5661,7 +5662,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -5673,8 +5674,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -5686,8 +5687,8 @@ msgstr "CA"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Mochila"
 
@@ -5783,7 +5784,7 @@ msgstr "MA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr "Correo"
 
@@ -5804,8 +5805,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -5958,7 +5959,7 @@ msgstr "Nombre:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5969,7 +5970,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6022,7 +6023,7 @@ msgstr "M"
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr "O"
 
@@ -6304,7 +6305,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6316,88 +6317,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Todo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecciona la cantidad de artículos a intercambiar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Seleccione la cantidad de artículos a tirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr "Selecciona la cantidad de artículos a enviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr "Seleccione la cantidad de objetos a almacenar en el carrito."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Seleccione la cantidad de artículos a recuperar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr "Seleccione la cantidad de artículos a recuperar del carrito."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Seleccione la cantidad de artículos."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Agregar tienda (compra)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Agregar a la tienda (venta)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Desconocido."
 
@@ -6632,87 +6633,87 @@ msgid "Open"
 msgstr "Abrir"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "barra de salud"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "barra de maná"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "barra de peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "barra de ranuras del inventario"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "barra de dinero"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "barra de estado"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "barra de trabajo"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Necesitas"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -6728,18 +6729,18 @@ msgid "Do you really want to sell %s?"
 msgstr "¿Realmente quieres vender %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Vestimenta: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Quitárselo antes"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Vestimenta AFK"
 
@@ -6882,73 +6883,72 @@ msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr "Publicar"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Anunciar"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Mostrar enlaces en el anuncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr "Por favor, introduce el nuevo nombre de la tienda"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr "Des-publicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Mover el jugador hacia arriba"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s quiere %s %s ¿aceptas?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s quiere %s %s ¿aceptas?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
@@ -8505,16 +8505,6 @@ msgstr "Pestaña siguiente del inventario"
 msgid "Clear drops window"
 msgstr "Limpiar ventana de drops"
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Almacenamiento"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr "Npc"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9120,9 +9110,9 @@ msgstr "Tienes un nuevo correo de %s, con el asunto %s"
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Nivel del gremio: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9518,6 +9508,21 @@ msgstr "mascota"
 msgid "skill"
 msgstr "habilidad"
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Almacenamiento"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr "Npc"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -9929,9 +9934,8 @@ msgstr "Captura fallida de mascota."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Mascota capturada."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/fi.po b/po/fi.po
index b29681b5e..3d0e2005d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -50,7 +50,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -62,43 +62,43 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr "Killan nimi puuttuu."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "ystävä"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "vaimennettu"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraali"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "mustalistattu"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vihollinen"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -416,8 +416,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -502,12 +502,12 @@ msgstr "Apua"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
@@ -1212,7 +1212,7 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1727,22 +1727,22 @@ msgstr "Luo ryhmä"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1772,7 +1772,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Tee kaupat"
 
@@ -1875,10 +1876,10 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Osta"
@@ -1893,10 +1894,10 @@ msgstr "Osta"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Myy"
@@ -1906,7 +1907,7 @@ msgstr "Myy"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
@@ -1932,7 +1933,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -1973,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1990,7 +1991,7 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
@@ -2016,8 +2017,8 @@ msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
@@ -2029,8 +2030,8 @@ msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
@@ -2045,8 +2046,8 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Poista"
 
@@ -2070,8 +2071,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
@@ -2096,7 +2097,7 @@ msgstr "Muokkaa loitsua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -2149,8 +2150,8 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
@@ -2160,73 +2161,73 @@ msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -2235,66 +2236,66 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2305,9 +2306,9 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2315,46 +2316,46 @@ msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2362,30 +2363,30 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2393,8 +2394,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2402,134 +2403,134 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2537,60 +2538,60 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2938,14 +2939,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2961,8 +2962,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Lisää"
@@ -2988,8 +2989,8 @@ msgstr "Sulje"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3000,8 +3001,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4494,7 +4495,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -4510,7 +4511,7 @@ msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -4937,7 +4938,7 @@ msgstr "Salli kuiskaukset"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Poista"
@@ -5599,7 +5600,7 @@ msgstr "Var"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -5611,8 +5612,8 @@ msgstr "Tav"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Tavarat"
 
@@ -5624,8 +5625,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Kärry"
 
@@ -5721,7 +5722,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5742,8 +5743,8 @@ msgstr "Ase"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Näppäin: %s"
@@ -5892,7 +5893,7 @@ msgstr "Nimi:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5903,7 +5904,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5956,7 +5957,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6232,7 +6233,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6244,88 +6245,88 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Kaikki"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Anna varastoitavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Lisää ostokauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Lisää myyntikauppaan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Tuntematon."
 
@@ -6560,87 +6561,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "terveyspalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "manapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "kokemuspalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "painopalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "tavarapaikkapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "rahapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "nuolipalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "tilapalkki"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "työpalkki"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Tarvitaan"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -6656,18 +6657,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Asu: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Riisu ensin"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Poissaoloasu"
 
@@ -6808,72 +6809,72 @@ msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Ilmoita"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Näytä linkit ilmoituksessa"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s haluaa %s %s - hyväksytkö?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s haluaa %s %s - hyväksytkö?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8428,16 +8429,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Varasto"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9038,9 +9029,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Kiltataso: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9436,6 +9427,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Varasto"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/fr.po b/po/fr.po
index f79eb39f9..c9a3fb08e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:01+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
@@ -64,7 +64,7 @@ msgstr "Fichier mis en ligne"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -76,43 +76,43 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
@@ -145,7 +145,7 @@ msgstr "Le nom de la guilde est manquant."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
@@ -176,91 +176,91 @@ msgid "equipped hat %s."
 msgstr "chapeau équipé %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur %s avec succès !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu arrêter d'ignorer ce joueur !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Joueur plus maintenant effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Le joueur n'a pas pu être effacé !"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "ami"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "écarté"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutre"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "sous liste noire"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "ennemi"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr "Message Rapide"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -433,8 +433,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -519,12 +519,12 @@ msgstr "Aide"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
@@ -1237,7 +1237,7 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Ressusciter"
 
@@ -1425,8 +1425,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1756,22 +1756,22 @@ msgstr "Créer un groupe"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1801,7 +1801,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Échange"
 
@@ -1904,10 +1905,10 @@ msgstr "Parler"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Acheter"
@@ -1922,10 +1923,10 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendre"
@@ -1935,7 +1936,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
@@ -1961,7 +1962,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -2002,7 +2003,7 @@ msgstr "Déposer le butin"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2019,7 +2020,7 @@ msgstr "Retirer"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renommer"
 
@@ -2045,8 +2046,8 @@ msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
@@ -2058,8 +2059,8 @@ msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -2074,8 +2075,8 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Enlever"
 
@@ -2099,8 +2100,8 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Costumes"
 
@@ -2125,7 +2126,7 @@ msgstr "Éditer le sortilège"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Effacer"
 
@@ -2178,8 +2179,8 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
@@ -2189,73 +2190,73 @@ msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nom :                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -2264,66 +2265,66 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2334,9 +2335,9 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2344,46 +2345,46 @@ msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "Ouvrir la fenêtre de réglages de la barre jaune"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Remise à zéro des valeurs de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2391,30 +2392,30 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
@@ -2422,8 +2423,8 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2431,134 +2432,134 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Déposer tout"
 
@@ -2566,60 +2567,60 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
@@ -2967,14 +2968,14 @@ msgstr "Niveau : %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2990,8 +2991,8 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Ajouter"
@@ -3017,8 +3018,8 @@ msgstr "Quitter"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3029,8 +3030,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4525,7 +4526,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Boutique"
 
@@ -4541,7 +4542,7 @@ msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "PNJ"
 
@@ -4979,7 +4980,7 @@ msgstr "Autoriser les messages privés"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Supprimer"
@@ -5648,7 +5649,7 @@ msgstr "Equ"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -5660,8 +5661,8 @@ msgstr "Inv"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -5673,8 +5674,8 @@ msgstr "CA"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Panier"
 
@@ -5770,7 +5771,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr "Mail"
 
@@ -5791,8 +5792,8 @@ msgstr "Cfg"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Touche : %s"
@@ -5941,7 +5942,7 @@ msgstr "Nom :"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5952,7 +5953,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6005,7 +6006,7 @@ msgstr "H"
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr "O"
 
@@ -6286,7 +6287,7 @@ msgstr "Insérer"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6298,88 +6299,88 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Tout"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Choisir le nombre d'objets à échanger."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Choisir le nombre d'objets à déposer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Choisir le nombre d'objets à stocker."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr "Sélectionnez la quantité d'articles à mettre dans votre panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Choisir le nombre d'objet à reprendre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr "Sélectionnez la quantité d'articles à récupérer du panier."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Choisir le nombre d'objets à séparer."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Ajouter à la boutique d'achats."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Ajouter à la boutique de ventes."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Inconnu."
 
@@ -6614,87 +6615,87 @@ msgid "Open"
 msgstr "Ouvrir"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barre de vie"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barre de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Barre d'expérience"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Barre de poids"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "Barre emplacements d'inventaire"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Barre d'argent"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "Barre de flèches"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Barre de statut"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Barre de compétences"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (MJ %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Restant"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Soumettre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -6710,18 +6711,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Veux-tu vraiment vendre %s ?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Tenue : %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Retirer d'abord l'équipement"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Équipement en absence"
 
@@ -6862,73 +6863,72 @@ msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr "Publier"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Annoncer"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Montrer les liens dans l'annonce"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr "Merci d'entrer le nouveau nom du magasin"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr "Supprimer"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Déplacer le joueur en haut"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s souhaite %s %s Acceptez-vous ?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s souhaite %s %s Acceptez-vous ?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
@@ -8489,16 +8489,6 @@ msgstr "Onglet d'inventaire suivant"
 msgid "Clear drops window"
 msgstr "Vider la fenêtre des dépôts"
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Entrepôt"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr "Npc"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9104,9 +9094,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Niveau de la guilde : %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9502,6 +9492,21 @@ msgstr "familier"
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Entrepôt"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr "Npc"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -9914,9 +9919,8 @@ msgstr "Echec de capture du familier."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Familier capturé."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/id.po b/po/id.po
index 554f5a62f..809dcc483 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -54,7 +54,7 @@ msgstr "Data telah terunggah"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -66,43 +66,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
@@ -134,7 +134,7 @@ msgstr "Nama organisasi hilang."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain berhasil %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Pemain belum lama telah dihapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "teman"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "diabaikan"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "netral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "daftar hitam"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "musuh"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -420,8 +420,8 @@ msgstr "Kamu lihat %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -506,12 +506,12 @@ msgstr "Bantuan"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
@@ -1215,7 +1215,7 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Hidupkan"
 
@@ -1400,8 +1400,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1731,22 +1731,22 @@ msgstr "Buat kelompok"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1776,7 +1776,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Dagang"
 
@@ -1879,10 +1880,10 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Beli"
@@ -1897,10 +1898,10 @@ msgstr "Beli"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Jual"
@@ -1910,7 +1911,7 @@ msgstr "Jual"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Tambah komentar"
 
@@ -1936,7 +1937,7 @@ msgstr "Tambah ke daftar serangan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
@@ -1977,7 +1978,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1994,7 +1995,7 @@ msgstr "Lepaskan"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ubah nama"
 
@@ -2020,8 +2021,8 @@ msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
@@ -2033,8 +2034,8 @@ msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
@@ -2049,8 +2050,8 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Hapus"
 
@@ -2074,8 +2075,8 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Perlengkapan"
 
@@ -2100,7 +2101,7 @@ msgstr "Edit mantra"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Hapus"
 
@@ -2153,8 +2154,8 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
@@ -2164,73 +2165,73 @@ msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "jendela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Buka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Tutup"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nama:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Tambah ke dagangan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Tambah ke dagangan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Tambah ke dagangan setengahnya"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Tambah ke dagangan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Tambah semua ke dagangan"
 
@@ -2239,66 +2240,66 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Simpan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Simpan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Simpan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Simpan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Ambil semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2309,9 +2310,9 @@ msgstr "Ambil semua"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2319,46 +2320,46 @@ msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2366,30 +2367,30 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Tampil jendela"
 
@@ -2397,8 +2398,8 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2406,134 +2407,134 @@ msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2541,60 +2542,60 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2942,14 +2943,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Uang: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2965,8 +2966,8 @@ msgstr "Buka url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Tambah"
@@ -2992,8 +2993,8 @@ msgstr "Keluar"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3004,8 +3005,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4496,7 +4497,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Toko"
 
@@ -4512,7 +4513,7 @@ msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4939,7 +4940,7 @@ msgstr "Perbolehkan berbisik"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Hapus"
@@ -5600,7 +5601,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -5612,8 +5613,8 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Perbekalan"
 
@@ -5625,8 +5626,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5722,7 +5723,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5743,8 +5744,8 @@ msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Kunci: %s"
@@ -5893,7 +5894,7 @@ msgstr "Nama:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5904,7 +5905,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5957,7 +5958,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6233,7 +6234,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6245,88 +6246,88 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Semua"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Pilih jumlah item yang ingin dibuang."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Pilih jumlah item yang ingin disimpan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Pilih jumlah item yang ingin diambil kembali."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Pilih jumlah item yang ingin dipisahkan."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Tambahkan ke daftar beli."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Tambahkan ke daftar jual."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Tidak diketahui."
 
@@ -6559,87 +6560,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Butuh"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Masukan"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Reset"
 
@@ -6655,18 +6656,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Setelan: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Copot lebih dahulu"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Setelan saat bepergian"
 
@@ -6807,72 +6808,72 @@ msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Toko personal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Umumkan"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Perlihatkan link di Umumkan"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s ingin %s %s apakah anda bersedia?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s ingin %s %s apakah anda bersedia?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8427,16 +8428,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Tempat penyimpanan"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9432,6 +9423,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Tempat penyimpanan"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/it.po b/po/it.po
index d4dc1820b..d66dcbb6f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -59,7 +59,7 @@ msgstr "File caricato"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -71,43 +71,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
@@ -139,7 +139,7 @@ msgstr "Manca il nome della gilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
@@ -169,91 +169,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "Amico"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "Disprezzato"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "Neutrale"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "nella lista nera"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "nemico"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -426,8 +426,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -512,12 +512,12 @@ msgstr "Aiuto"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1224,7 +1224,7 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1411,8 +1411,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(default)"
 
@@ -1742,22 +1742,22 @@ msgstr "Crea gruppo"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1787,7 +1787,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Commercia"
 
@@ -1890,10 +1891,10 @@ msgstr "Parla"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Compra"
@@ -1908,10 +1909,10 @@ msgstr "Compra"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vendi"
@@ -1921,7 +1922,7 @@ msgstr "Vendi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
@@ -1947,7 +1948,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -1988,7 +1989,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2005,7 +2006,7 @@ msgstr "Togli"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -2031,8 +2032,8 @@ msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
@@ -2044,8 +2045,8 @@ msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
@@ -2060,8 +2061,8 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2085,8 +2086,8 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -2111,7 +2112,7 @@ msgstr "Modifica Incantesimo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Cancella"
 
@@ -2164,8 +2165,8 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
@@ -2175,73 +2176,73 @@ msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -2250,66 +2251,66 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2320,9 +2321,9 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2330,46 +2331,46 @@ msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2377,30 +2378,30 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Mostra Finestra"
 
@@ -2408,8 +2409,8 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2417,134 +2418,134 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2552,60 +2553,60 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2953,14 +2954,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2976,8 +2977,8 @@ msgstr "Apri url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Aggiungi"
@@ -3003,8 +3004,8 @@ msgstr "Esci"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3015,8 +3016,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4509,7 +4510,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Negozio"
 
@@ -4525,7 +4526,7 @@ msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4952,7 +4953,7 @@ msgstr "Permetti sussurri"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Elimina"
@@ -5619,7 +5620,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -5631,8 +5632,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -5644,8 +5645,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrello"
 
@@ -5741,7 +5742,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5762,8 +5763,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Chiave: %s"
@@ -5912,7 +5913,7 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5923,7 +5924,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5976,7 +5977,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6252,7 +6253,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6264,88 +6265,88 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Tutti"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Seleziona la quantità di oggetti da scambiare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Seleziona la quantità di oggetti da lasciare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Selezionare la quantità di oggetti da riporre."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Seleziona la quantità di oggetti da ritirare."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Seleziona la quantità di oggetti da dividere."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Aggiungi allo shop di acquisto."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Aggiungi allo shop di vendita."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Sconosciuto."
 
@@ -6580,87 +6581,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra HP"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Barra dell'esperienza"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Barra del peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "barra dell'inventario"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Barra dei soldi"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "barra frecce"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Barra dello stato"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Barra dei punti lavoro"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Bisogno"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Invia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -6676,18 +6677,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Outfit: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Rimuovi prima"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Away outfit"
 
@@ -6828,72 +6829,72 @@ msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Annuncia"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Mostra link nell'annuncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s vuole %s %s accetti?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s vuole %s %s accetti?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8450,16 +8451,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Magazzino"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9061,9 +9052,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Livello Gilda: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9459,6 +9450,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Magazzino"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/ja.po b/po/ja.po
index e4841f384..5dd5017b2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:01+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -55,7 +55,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -67,43 +67,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgstr "ギルド名がありません."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーを完全無視できませんでした!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "プレイヤーを完全無視解除しました!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "プレイヤーを完全無視解除できませんでした!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "友達"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "無視"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中性"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "敵"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -420,8 +420,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -506,12 +506,12 @@ msgstr "ヘルプ"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -1218,7 +1218,7 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1402,8 +1402,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1733,22 +1733,22 @@ msgstr "パーティを作る"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1778,7 +1778,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "トレード"
 
@@ -1881,10 +1882,10 @@ msgstr "話す"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "買う"
@@ -1899,10 +1900,10 @@ msgstr "買う"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "売る"
@@ -1912,7 +1913,7 @@ msgstr "売る"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1938,7 +1939,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -1979,7 +1980,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1996,7 +1997,7 @@ msgstr "取外す"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "名前を変更する"
 
@@ -2022,8 +2023,8 @@ msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
@@ -2035,8 +2036,8 @@ msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "チャットに追加"
 
@@ -2051,8 +2052,8 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "削除"
 
@@ -2076,8 +2077,8 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "服装"
 
@@ -2102,7 +2103,7 @@ msgstr "呪文を編集する"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "クリア"
 
@@ -2155,8 +2156,8 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
@@ -2166,73 +2167,73 @@ msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -2241,66 +2242,66 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2311,9 +2312,9 @@ msgstr "全部取出す"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2321,46 +2322,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2368,30 +2369,30 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2399,8 +2400,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2408,134 +2409,134 @@ msgstr "レベル: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2543,60 +2544,60 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2944,14 +2945,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "装着."
 
@@ -2967,8 +2968,8 @@ msgstr "URLを開く"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "追加"
@@ -2994,8 +2995,8 @@ msgstr "終了"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3006,8 +3007,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4500,7 +4501,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "店"
 
@@ -4516,7 +4517,7 @@ msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4943,7 +4944,7 @@ msgstr "全てのささやきを受け取る"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "削除"
@@ -5604,7 +5605,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "装着品"
 
@@ -5616,8 +5617,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "インベントリー"
 
@@ -5629,8 +5630,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "カート"
 
@@ -5726,7 +5727,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5747,8 +5748,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "鍵: %s"
@@ -5897,7 +5898,7 @@ msgstr "名前:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5908,7 +5909,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5961,7 +5962,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6237,7 +6238,7 @@ msgstr "挿入"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6249,88 +6250,88 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "全て"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "トレードするアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "落とすアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "保管するアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "取出すアイテムの数量を入力してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "分割するアイテムの量を選択してください."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "購入リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "販売リストに追加."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "不明."
 
@@ -6563,87 +6564,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "健康"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "マナ"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Expバー"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "重量"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "インベントリースロットバー"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "金銭"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "矢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "情勢"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "職"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "必要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "決定"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "リセット"
 
@@ -6659,18 +6660,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "服装: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "最初に取外す"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "AFK中の服装"
 
@@ -6811,72 +6812,72 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "アナウンス"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "アナウンスにリンクを表示する"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%sが%s %sを希望しています。承認しますか?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%sが%s %sを希望しています。承認しますか?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8433,16 +8434,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "倉庫"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9044,9 +9035,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "ギルドレベル: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9442,6 +9433,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "倉庫"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 64640883d..3570308e8 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\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"
@@ -48,7 +48,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -60,43 +60,43 @@ msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -127,7 +127,7 @@ msgstr ""
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr ""
 
@@ -157,91 +157,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -414,8 +414,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr ""
 
@@ -500,12 +500,12 @@ msgstr ""
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -1209,7 +1209,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1393,8 +1393,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1724,22 +1724,22 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1769,7 +1769,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr ""
 
@@ -1872,10 +1873,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr ""
@@ -1890,10 +1891,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr ""
@@ -1903,7 +1904,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1929,7 +1930,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1970,7 +1971,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1987,7 +1988,7 @@ msgstr ""
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
@@ -2013,8 +2014,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr ""
 
@@ -2026,8 +2027,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr ""
 
@@ -2042,8 +2043,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr ""
 
@@ -2067,8 +2068,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
@@ -2093,7 +2094,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
@@ -2146,8 +2147,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2157,73 +2158,73 @@ msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr ""
 
@@ -2232,66 +2233,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr ""
 
@@ -2302,9 +2303,9 @@ msgstr ""
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2312,46 +2313,46 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr ""
 
@@ -2359,30 +2360,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2390,8 +2391,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2399,134 +2400,134 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr ""
 
@@ -2534,60 +2535,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2935,14 +2936,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2958,8 +2959,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr ""
@@ -2985,8 +2986,8 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -2997,8 +2998,8 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr ""
 
@@ -4489,7 +4490,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr ""
 
@@ -4505,7 +4506,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr ""
 
@@ -4932,7 +4933,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr ""
@@ -5593,7 +5594,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr ""
 
@@ -5605,8 +5606,8 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr ""
 
@@ -5618,8 +5619,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5715,7 +5716,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5736,8 +5737,8 @@ msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -5886,7 +5887,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -5897,7 +5898,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -5950,7 +5951,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6226,7 +6227,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6238,88 +6239,88 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr ""
 
@@ -6554,87 +6555,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr ""
 
@@ -6650,18 +6651,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr ""
 
@@ -6802,72 +6803,72 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
+#: src/gui/windows/shopwindow.cpp:991
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
+#: src/gui/windows/shopwindow.cpp:998
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8422,16 +8423,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9427,6 +9418,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/nl.po b/po/nl.po
index 2a70329a2..af935630e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:03+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -52,7 +52,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -64,43 +64,43 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -131,7 +131,7 @@ msgstr "Guild-naam ontbreekt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -504,12 +504,12 @@ msgstr "Help"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1213,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1730,22 +1730,22 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1775,7 +1775,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Handel"
 
@@ -1878,10 +1879,10 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kopen"
@@ -1896,10 +1897,10 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkopen"
@@ -1909,7 +1910,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1935,7 +1936,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1976,7 +1977,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1993,7 +1994,7 @@ msgstr "Afdoen"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -2019,8 +2020,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2032,8 +2033,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2048,8 +2049,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2073,8 +2074,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -2099,7 +2100,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2152,8 +2153,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2163,73 +2164,73 @@ msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr ""
 
@@ -2238,66 +2239,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2308,9 +2309,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2318,46 +2319,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2365,30 +2366,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2396,8 +2397,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2405,134 +2406,134 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2540,60 +2541,60 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2941,14 +2942,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2964,8 +2965,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Toevoegen"
@@ -2991,8 +2992,8 @@ msgstr "Afsluiten"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3003,8 +3004,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4495,7 +4496,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4511,7 +4512,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4938,7 +4939,7 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
@@ -5605,7 +5606,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5617,8 +5618,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -5630,8 +5631,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
 
@@ -5727,7 +5728,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5748,8 +5749,8 @@ msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
@@ -5898,7 +5899,7 @@ msgstr "Naam:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5909,7 +5910,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5962,7 +5963,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6238,7 +6239,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6250,88 +6251,88 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6566,87 +6567,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Nood"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Reset"
 
@@ -6662,18 +6663,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Verwijder uitrusting eerst"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
@@ -6814,72 +6815,72 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8436,16 +8437,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9445,6 +9436,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 2a70329a2..af935630e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:03+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -52,7 +52,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -64,43 +64,43 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -131,7 +131,7 @@ msgstr "Guild-naam ontbreekt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -504,12 +504,12 @@ msgstr "Help"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1213,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1730,22 +1730,22 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1775,7 +1775,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Handel"
 
@@ -1878,10 +1879,10 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kopen"
@@ -1896,10 +1897,10 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Verkopen"
@@ -1909,7 +1910,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1935,7 +1936,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -1976,7 +1977,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1993,7 +1994,7 @@ msgstr "Afdoen"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
@@ -2019,8 +2020,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2032,8 +2033,8 @@ msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2048,8 +2049,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2073,8 +2074,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kleren"
 
@@ -2099,7 +2100,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2152,8 +2153,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2163,73 +2164,73 @@ msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr ""
 
@@ -2238,66 +2239,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2308,9 +2309,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2318,46 +2319,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2365,30 +2366,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2396,8 +2397,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2405,134 +2406,134 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2540,60 +2541,60 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2941,14 +2942,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2964,8 +2965,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Toevoegen"
@@ -2991,8 +2992,8 @@ msgstr "Afsluiten"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3003,8 +3004,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4495,7 +4496,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4511,7 +4512,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4938,7 +4939,7 @@ msgstr "Fluisteren toestaan"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Verwijderen"
@@ -5605,7 +5606,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5617,8 +5618,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -5630,8 +5631,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
 
@@ -5727,7 +5728,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5748,8 +5749,8 @@ msgstr "CONF"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Toets: %s"
@@ -5898,7 +5899,7 @@ msgstr "Naam:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5909,7 +5910,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5962,7 +5963,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6238,7 +6239,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6250,88 +6251,88 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Alle"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal voorwerpen om te verhandelen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal voorwerpen om neer te leggen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Toevoegen om te kopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Toevoegen om te verkopen."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Onbekend."
 
@@ -6566,87 +6567,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Nood"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Reset"
 
@@ -6662,18 +6663,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Kleren: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Verwijder uitrusting eerst"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Kleren om weg te gaan"
 
@@ -6814,72 +6815,72 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Aankondigingen"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Toon links in aankondigingen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s wilt %s %s ga je akkoord?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8436,16 +8437,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9445,6 +9436,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/pl.po b/po/pl.po
index df2a5ee42..b79458fef 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -56,7 +56,7 @@ msgstr "Plik wysłano"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -68,43 +68,43 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
@@ -135,7 +135,7 @@ msgstr "Brak nazwy gildii."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "znajomy"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "lekceważony"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutralny"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "wróg"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -423,8 +423,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -509,12 +509,12 @@ msgstr "Pomoc"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
@@ -1218,7 +1218,7 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Wskrześ"
 
@@ -1405,8 +1405,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1736,22 +1736,22 @@ msgstr "Utwórz grupę"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1781,7 +1781,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Handel"
 
@@ -1884,10 +1885,10 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Kup"
@@ -1902,10 +1903,10 @@ msgstr "Kup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sprzedaj"
@@ -1915,7 +1916,7 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
@@ -1941,7 +1942,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -1982,7 +1983,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1999,7 +2000,7 @@ msgstr "Zdejmij"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -2025,8 +2026,8 @@ msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
@@ -2038,8 +2039,8 @@ msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
@@ -2054,8 +2055,8 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Usuń"
 
@@ -2079,8 +2080,8 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Stroje"
 
@@ -2105,7 +2106,7 @@ msgstr "Edytuj zaklęcie"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -2158,8 +2159,8 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
@@ -2169,73 +2170,73 @@ msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nick:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -2244,66 +2245,66 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2314,9 +2315,9 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2324,46 +2325,46 @@ msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "W dół"
 
@@ -2371,30 +2372,30 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Pokaż okno"
 
@@ -2402,8 +2403,8 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2411,134 +2412,134 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2546,60 +2547,60 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2947,14 +2948,14 @@ msgstr "Poziom: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Ekw."
 
@@ -2970,8 +2971,8 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Dodaj"
@@ -2997,8 +2998,8 @@ msgstr "Wyjdź"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3009,8 +3010,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4505,7 +4506,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Sklep"
 
@@ -4521,7 +4522,7 @@ msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4950,7 +4951,7 @@ msgstr "Zezwól na szepty"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Usuń"
@@ -5616,7 +5617,7 @@ msgstr "EKW"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -5628,8 +5629,8 @@ msgstr "INW"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -5641,8 +5642,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Wózek"
 
@@ -5738,7 +5739,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5759,8 +5760,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Klawisz: %s"
@@ -5909,7 +5910,7 @@ msgstr "Nazwa:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5920,7 +5921,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5973,7 +5974,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6254,7 +6255,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6266,88 +6267,88 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "wszystkie"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Wybierz ilość przedmiotów do handlu."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Wybierz ilość przedmiotów do upuszczenia."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Podaj ilość rzeczy do przechowania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Wybierz ilość przedmiotów do pobrania."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Wybierz ilość przedmiotów do podziału."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Dodaj to sklepu (sprzedaj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Dodaj do sklepu (kupuj)."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Nieznany obiekt."
 
@@ -6584,87 +6585,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "pasek życia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "pasek many"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "pasek punktów doświadczenia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "pasek obciążenia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "pasek miejsc w inwentarzu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "pasek pieniędzy"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "pasek strzał"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "pasek statusu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "pasek punktów umiejętności"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Potrzeba"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Zatwierdź"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -6680,18 +6681,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Czy naprawdę chcesz sprzedać %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Strój: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Najpierw zdejmij"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Strój na afk"
 
@@ -6832,72 +6833,72 @@ msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Ogłoś"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Pokazuj linki w ogłoszeniach"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s chce %s%s, akceptujesz?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s chce %s%s, akceptujesz?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8454,16 +8455,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Magazyn"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9063,9 +9054,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Poziom gildii: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9461,6 +9452,21 @@ msgstr "zwierzątko"
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Magazyn"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/pt.po b/po/pt.po
index fa290ebb4..6e1911af2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -52,7 +52,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -64,43 +64,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr "Falta o nome da guilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador(a)!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "Inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -504,12 +504,12 @@ msgstr "Ajuda"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -1218,7 +1218,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1406,8 +1406,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1737,22 +1737,22 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1782,7 +1782,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Negócios"
 
@@ -1885,10 +1886,10 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
@@ -1903,10 +1904,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
@@ -1916,7 +1917,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1942,7 +1943,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1983,7 +1984,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2000,7 +2001,7 @@ msgstr "Desequipar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
@@ -2026,8 +2027,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
@@ -2039,8 +2040,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2055,8 +2056,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "A Remover"
 
@@ -2080,8 +2081,8 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -2106,7 +2107,7 @@ msgstr "Editar Feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2159,8 +2160,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
@@ -2170,73 +2171,73 @@ msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -2245,66 +2246,66 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2315,9 +2316,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2325,46 +2326,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2372,30 +2373,30 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Mostrar janela"
 
@@ -2403,8 +2404,8 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2412,134 +2413,134 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2547,60 +2548,60 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2948,14 +2949,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2971,8 +2972,8 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Adicionar"
@@ -2998,8 +2999,8 @@ msgstr "Sair"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3010,8 +3011,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4504,7 +4505,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Loja"
 
@@ -4520,7 +4521,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4947,7 +4948,7 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
@@ -5612,7 +5613,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5624,8 +5625,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -5637,8 +5638,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -5734,7 +5735,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5755,8 +5756,8 @@ msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -5905,7 +5906,7 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5916,7 +5917,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5969,7 +5970,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6250,7 +6251,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6262,88 +6263,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6578,87 +6579,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de Vida"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Barra de Peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Barra de Status"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Precisa"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Resetar"
 
@@ -6674,18 +6675,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Você realmente deseja vender %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -6826,72 +6827,72 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8447,16 +8448,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Armazém"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9058,9 +9049,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Nível Guilda: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9456,6 +9447,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Armazém"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6fd89fba5..564451d46 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -63,7 +63,7 @@ msgstr "Arquivo enviado"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -75,43 +75,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
@@ -144,7 +144,7 @@ msgstr "Falta o nome da guilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
@@ -174,91 +174,91 @@ msgid "equipped hat %s."
 msgstr "chapéu %s equipado."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pôde ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais sendo ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Jogador não mais apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Jogador não pôde ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr "Mensagem rápida"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "Config value: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "Server config value: %s"
@@ -431,8 +431,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -517,12 +517,12 @@ msgstr "Ajuda"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -1230,7 +1230,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Reviver"
 
@@ -1418,8 +1418,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1749,22 +1749,22 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1794,7 +1794,8 @@ msgstr "Cartões: "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Negociação"
 
@@ -1897,10 +1898,10 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Comprar"
@@ -1915,10 +1916,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Vender"
@@ -1928,7 +1929,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1954,7 +1955,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -1995,7 +1996,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2012,7 +2013,7 @@ msgstr "Desequipar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
@@ -2038,8 +2039,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
@@ -2051,8 +2052,8 @@ msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2067,8 +2068,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Remover"
 
@@ -2092,8 +2093,8 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
@@ -2118,7 +2119,7 @@ msgstr "Editar feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2171,8 +2172,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
@@ -2182,73 +2183,73 @@ msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Adicionar na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Adicionar 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Adicionar metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para negociação-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Adicionar todos na negociação"
 
@@ -2257,66 +2258,66 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2327,9 +2328,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2337,46 +2338,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2384,30 +2385,30 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Mostrar Janela"
 
@@ -2415,8 +2416,8 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2424,134 +2425,134 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2559,60 +2560,60 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
@@ -2960,14 +2961,14 @@ msgstr "Nível: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2983,8 +2984,8 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Adicionar"
@@ -3010,8 +3011,8 @@ msgstr "Sair"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3022,8 +3023,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4646,7 +4647,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Loja"
 
@@ -4662,7 +4663,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -5093,7 +5094,7 @@ msgstr "Permitir mensagens particulares"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Excluir"
@@ -5758,7 +5759,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5770,8 +5771,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -5783,8 +5784,8 @@ msgstr "CA"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -5880,7 +5881,7 @@ msgstr "MA"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr "Email"
 
@@ -5901,8 +5902,8 @@ msgstr "CON"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Tecla: %s"
@@ -6051,7 +6052,7 @@ msgstr "Nome:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6062,7 +6063,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6115,7 +6116,7 @@ msgstr "M"
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr "O"
 
@@ -6396,7 +6397,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6408,88 +6409,88 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr "Insira o cartão requisitado"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "insira %s em %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Tudo"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr "Selecione quantidade de itens para enviar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr "Selecione quantidade de itens para adicionar ao carrinho."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr "Selecione quantidade de itens para retornar do carrinho."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Adicionar na loja de compra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Adicionar na loja de venda."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Desconhecido."
 
@@ -6724,87 +6725,87 @@ msgid "Open"
 msgstr "Abrir"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "Barra de Vida"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "Barra de Mana"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "Barra de experiencia"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "Barra de Peso"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "Barra de slots no inventário"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "Barra de Dinheiro"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "Barra de flechas"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "Barra de Status"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "Barra de Job"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Precisa"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Nível de profissão: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Resetar"
 
@@ -6820,18 +6821,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Você realmente quer vender: %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Roupas em modo ausente"
 
@@ -6972,73 +6973,72 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr "Publicar"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Anúncio"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Mostrar links em anúncio"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr "Por favor digite o nome da nova loja"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr "Despublicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Move jogador para cima"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s quer %s %s você aceita?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
@@ -8594,16 +8594,6 @@ msgstr "Próxima aba do inventário"
 msgid "Clear drops window"
 msgstr "Limpar janela de descartes"
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Armazém"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr "Npc"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9206,9 +9196,9 @@ msgstr "Você tem um novo E-mail de %s assunto %s"
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Nível Guilda: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9604,6 +9594,21 @@ msgstr "animal de estimação"
 msgid "skill"
 msgstr "Habilidade"
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Armazém"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr "Npc"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -10016,9 +10021,8 @@ msgstr "Captura de animal de estimação falhou."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Animal de estimação capturado."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/ru.po b/po/ru.po
index 73dc725cc..05fff238a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 11:00+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
@@ -62,7 +62,7 @@ msgstr "Файл выгружен"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -74,43 +74,43 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
@@ -141,7 +141,7 @@ msgstr "Не задано имя гильдии."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
@@ -171,91 +171,91 @@ msgid "equipped hat %s."
 msgstr "Одета шапка: %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Игрок больше не удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "друг"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "нейтральный"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "враг"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr "Быстрое сообщение"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "Значение настройки: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "Значение настройки для этого сервера: %s"
@@ -430,8 +430,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -516,12 +516,12 @@ msgstr "Помощь"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1227,7 +1227,7 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Оживить"
 
@@ -1415,8 +1415,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1746,22 +1746,22 @@ msgstr "Создать группу"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1791,7 +1791,8 @@ msgstr "Карты: "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Торговать"
 
@@ -1894,10 +1895,10 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Купить"
@@ -1912,10 +1913,10 @@ msgstr "Купить"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Продать"
@@ -1925,7 +1926,7 @@ msgstr "Продать"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
@@ -1951,7 +1952,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -1992,7 +1993,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2009,7 +2010,7 @@ msgstr "Снять"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -2035,8 +2036,8 @@ msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
@@ -2048,8 +2049,8 @@ msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -2064,8 +2065,8 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2089,8 +2090,8 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Наряды"
 
@@ -2115,7 +2116,7 @@ msgstr "Изменить заклинание"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Очистить"
 
@@ -2168,8 +2169,8 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
@@ -2179,73 +2180,73 @@ msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Имя:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -2254,66 +2255,66 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2324,9 +2325,9 @@ msgstr "Получить все"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2334,46 +2335,46 @@ msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2381,30 +2382,30 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Показать окно"
 
@@ -2412,8 +2413,8 @@ msgstr "Показать окно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2421,134 +2422,134 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2556,60 +2557,60 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
@@ -2957,14 +2958,14 @@ msgstr "Уровень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Од."
 
@@ -2980,8 +2981,8 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Добавить"
@@ -3007,8 +3008,8 @@ msgstr "Выход"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3019,8 +3020,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4516,7 +4517,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Магазин"
 
@@ -4532,7 +4533,7 @@ msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4966,7 +4967,7 @@ msgstr "Разрешить шептание"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Удалить"
@@ -5633,7 +5634,7 @@ msgstr "СН"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -5645,8 +5646,8 @@ msgstr "ИНВ"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Инвентарь"
 
@@ -5658,8 +5659,8 @@ msgstr "ТЕ"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Телега"
 
@@ -5755,7 +5756,7 @@ msgstr "ПО"
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr "Почта"
 
@@ -5776,8 +5777,8 @@ msgstr "ОПЦ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Клавиша: %s"
@@ -5926,7 +5927,7 @@ msgstr "Имя:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5937,7 +5938,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5990,7 +5991,7 @@ msgstr "М"
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr "Н"
 
@@ -6271,7 +6272,7 @@ msgstr "Вставка"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6283,88 +6284,88 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr "П"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr "М"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Всё"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Укажите количество вещей для хранения."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr "Укажите количество для отправки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr "Укажите количество вещей для хранения в прицепе."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Укажите количество вещей для изъятия."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr "Укажите количество вещей для изъятия из прицепа."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Добавить в список покупки."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Добавить в список продажи."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Неизвестно."
 
@@ -6603,87 +6604,87 @@ msgid "Open"
 msgstr "Открыть"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "здоровье"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "мана"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "опыт"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "вес"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "слоты интвентаря"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "деньги"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "стрелы"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "статус"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "работа"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Нужно"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Применить"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -6699,18 +6700,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Вы действительно хотите продать %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Наряд: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Сначала снять"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "наряд отсутствия"
 
@@ -6851,73 +6852,72 @@ msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr "Опубликовать"
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Показывать ссылки"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr "Пожалуйста, введите имя вашего магазина"
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr "Убрать"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Движение игрока вверх"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s хочет %s %s, вы принимаете предложение?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s хочет %s %s, вы принимаете предложение?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
@@ -8474,16 +8474,6 @@ msgstr "Следующая вкладка инвентаря"
 msgid "Clear drops window"
 msgstr "Очистить окно бросания"
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Хранилище"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr "НИП"
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9084,9 +9074,9 @@ msgstr "Вам пришло сообщение от %s и заголовком %
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Уровень гильдии: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9482,6 +9472,21 @@ msgstr "животное"
 msgid "skill"
 msgstr "Скил"
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Хранилище"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr "НИП"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -9893,9 +9898,8 @@ msgstr "Попытка поймать не удалась."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Питомец пойман."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/sr.po b/po/sr.po
index 7ebccd124..7326a4c60 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -51,7 +51,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -63,43 +63,43 @@ msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Nedostaje ime udruženja."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Definiši ime."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Igrač je već %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Igrač je uspešno %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Igrač nije mogao biti %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Igrač nije ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Igrač nije više ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Igrač nije mogao da se de-ignoriše!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Igrač je već obrisan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Igrač se nije mogao obrisati!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "prijatelj"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "zanemaren"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutralan"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr ""
 
@@ -504,12 +504,12 @@ msgstr "Pomoć"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
@@ -1213,7 +1213,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1397,8 +1397,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1728,22 +1728,22 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1773,7 +1773,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr ""
 
@@ -1876,10 +1877,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr ""
@@ -1894,10 +1895,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr ""
@@ -1907,7 +1908,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1933,7 +1934,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1974,7 +1975,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1991,7 +1992,7 @@ msgstr "Skini"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
@@ -2017,8 +2018,8 @@ msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr ""
 
@@ -2030,8 +2031,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
@@ -2046,8 +2047,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr ""
 
@@ -2071,8 +2072,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
@@ -2097,7 +2098,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
@@ -2150,8 +2151,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2161,73 +2162,73 @@ msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Ime:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr ""
 
@@ -2236,66 +2237,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Sačuvaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Sačuvaj pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Sačuvaj sve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Uzmi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Uzmi pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Uzmi sve"
 
@@ -2306,9 +2307,9 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2316,46 +2317,46 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr ""
 
@@ -2363,30 +2364,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2394,8 +2395,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2403,134 +2404,134 @@ msgstr "Nivo: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoriši"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr ""
 
@@ -2538,60 +2539,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2939,14 +2940,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2962,8 +2963,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr ""
@@ -2989,8 +2990,8 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -3001,8 +3002,8 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr ""
 
@@ -4495,7 +4496,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr ""
 
@@ -4511,7 +4512,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr ""
 
@@ -4938,7 +4939,7 @@ msgstr "Dozvoli šaputanje"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Obriši"
@@ -5599,7 +5600,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Oprema"
 
@@ -5611,8 +5612,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Lista predmeta"
 
@@ -5624,8 +5625,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5721,7 +5722,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5742,8 +5743,8 @@ msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -5892,7 +5893,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -5903,7 +5904,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -5956,7 +5957,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6232,7 +6233,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6244,88 +6245,88 @@ msgid "Equip"
 msgstr "Obuci"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr ""
 
@@ -6562,87 +6563,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivo: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr ""
 
@@ -6658,18 +6659,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr ""
 
@@ -6810,72 +6811,72 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
+#: src/gui/windows/shopwindow.cpp:991
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
+#: src/gui/windows/shopwindow.cpp:998
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8430,16 +8431,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9435,6 +9426,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/sv.po b/po/sv.po
index 0a03aeb67..bc4013dea 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:05+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -49,7 +49,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -61,43 +61,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -128,7 +128,7 @@ msgstr "Guild-namn saknas."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
@@ -158,91 +158,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -501,12 +501,12 @@ msgstr "Hjälp"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -1213,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1728,22 +1728,22 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1773,7 +1773,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Trade"
 
@@ -1876,10 +1877,10 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Köp"
@@ -1894,10 +1895,10 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sälj"
@@ -1907,7 +1908,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1933,7 +1934,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1974,7 +1975,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1991,7 +1992,7 @@ msgstr "Unequip"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -2017,8 +2018,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2030,8 +2031,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2046,8 +2047,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2071,8 +2072,8 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Utstyrsel"
 
@@ -2097,7 +2098,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
@@ -2150,8 +2151,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2161,73 +2162,73 @@ msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2236,66 +2237,66 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2306,9 +2307,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2316,46 +2317,46 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2363,30 +2364,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2394,8 +2395,8 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2403,134 +2404,134 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2538,60 +2539,60 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2939,14 +2940,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2962,8 +2963,8 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Lägg till"
@@ -2989,8 +2990,8 @@ msgstr "Avsluta"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3001,8 +3002,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4495,7 +4496,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Shop"
 
@@ -4511,7 +4512,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4939,7 +4940,7 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
@@ -5604,7 +5605,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5616,8 +5617,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -5629,8 +5630,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
 
@@ -5726,7 +5727,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5747,8 +5748,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
@@ -5897,7 +5898,7 @@ msgstr "Namn:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5908,7 +5909,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5961,7 +5962,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6244,7 +6245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6256,88 +6257,88 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6572,87 +6573,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "health bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "mana bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "experience bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "weight bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "inventory slots bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "money bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "arrows bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "status bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "job bar"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Behöver"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Återställ"
 
@@ -6668,18 +6669,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Vill du verkligen sälja %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Klädsel: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Unequipa först"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Borta-klädsel"
 
@@ -6820,72 +6821,72 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8442,16 +8443,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Storage"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9054,9 +9045,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Guild level: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9452,6 +9443,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Storage"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 0a03aeb67..bc4013dea 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2016-01-03 17:05+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -49,7 +49,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -61,43 +61,43 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -128,7 +128,7 @@ msgstr "Guild-namn saknas."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
@@ -158,91 +158,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -415,8 +415,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -501,12 +501,12 @@ msgstr "Hjälp"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -1213,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1728,22 +1728,22 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1773,7 +1773,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Trade"
 
@@ -1876,10 +1877,10 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Köp"
@@ -1894,10 +1895,10 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sälj"
@@ -1907,7 +1908,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr ""
 
@@ -1933,7 +1934,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -1974,7 +1975,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1991,7 +1992,7 @@ msgstr "Unequip"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
@@ -2017,8 +2018,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2030,8 +2031,8 @@ msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2046,8 +2047,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2071,8 +2072,8 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Utstyrsel"
 
@@ -2097,7 +2098,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
@@ -2150,8 +2151,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2161,73 +2162,73 @@ msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2236,66 +2237,66 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2306,9 +2307,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2316,46 +2317,46 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2363,30 +2364,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2394,8 +2395,8 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2403,134 +2404,134 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2538,60 +2539,60 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2939,14 +2940,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Eq."
 
@@ -2962,8 +2963,8 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Lägg till"
@@ -2989,8 +2990,8 @@ msgstr "Avsluta"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3001,8 +3002,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4495,7 +4496,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Shop"
 
@@ -4511,7 +4512,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4939,7 +4940,7 @@ msgstr "Tillåt viskningar"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Radera"
@@ -5604,7 +5605,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5616,8 +5617,8 @@ msgstr "INV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -5629,8 +5630,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
 
@@ -5726,7 +5727,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5747,8 +5748,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Nyckel: %s"
@@ -5897,7 +5898,7 @@ msgstr "Namn:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5908,7 +5909,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5961,7 +5962,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6244,7 +6245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6256,88 +6257,88 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Alla"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Välj antal items att byta."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Välj antal items att slänga."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Välj antal items att lagra."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal items att apportera."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Välj antal items att dela."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Lägg till i buy shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Lägg till i sell shop."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Okänd."
 
@@ -6572,87 +6573,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "health bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "mana bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "experience bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "weight bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "inventory slots bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "money bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "arrows bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "status bar"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "job bar"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Behöver"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Återställ"
 
@@ -6668,18 +6669,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Vill du verkligen sälja %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Klädsel: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Unequipa först"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Borta-klädsel"
 
@@ -6820,72 +6821,72 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Annonsera"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Visa länkar i annonseringen"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s vill %s %s, accepterar du?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8442,16 +8443,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Storage"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9054,9 +9045,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Guild level: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9452,6 +9443,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Storage"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/tr.po b/po/tr.po
index 57875fbfd..e3cb15ab6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -51,7 +51,7 @@ msgstr "Dosya yüklendi"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -63,43 +63,43 @@ msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
@@ -130,7 +130,7 @@ msgstr "Guild adı eksik."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Oyuncu zaten %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Oyuncu başarı ile %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Oyuncu %s yapılamadı!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Oyuncu görmezden gelinmiyordu!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Oyuncu daha fazla görmezden gelinmiyor!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Oyuncuyu görmezden gelme geri alınamadı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Oyuncu zaten silindi!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Oyuncu geri alındı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Oyuncu silinemedi!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "arkadaş"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ihmal edilmiş"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "nötr"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "kara listeye alınmış"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "düşman"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -417,8 +417,8 @@ msgstr "%s görüyorsun"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -503,12 +503,12 @@ msgstr "Yardım"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
@@ -1212,7 +1212,7 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Dirilt"
 
@@ -1400,8 +1400,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1731,22 +1731,22 @@ msgstr "Parti kur"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1776,7 +1776,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Takas"
 
@@ -1879,10 +1880,10 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Satın Al"
@@ -1897,10 +1898,10 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Sat"
@@ -1910,7 +1911,7 @@ msgstr "Sat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Yorum ekle"
 
@@ -1936,7 +1937,7 @@ msgstr "Saldırı listesine ekle"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -1977,7 +1978,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1994,7 +1995,7 @@ msgstr "Çıkar"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
@@ -2020,8 +2021,8 @@ msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Partiden at"
 
@@ -2033,8 +2034,8 @@ msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
@@ -2049,8 +2050,8 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -2074,8 +2075,8 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kıyafetler"
 
@@ -2100,7 +2101,7 @@ msgstr "Büyü düzenle"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Temizle"
 
@@ -2153,8 +2154,8 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
@@ -2164,73 +2165,73 @@ msgid "Change guild position"
 msgstr "Guild pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "pencere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Kilidi aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Kilitle"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "İsim:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Oyuncu yorumu             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Yorum:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -2239,66 +2240,66 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Tamamını geri al-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2309,9 +2310,9 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2319,46 +2320,46 @@ msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr ""
 
@@ -2366,30 +2367,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2397,8 +2398,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2406,134 +2407,134 @@ msgstr "Seviye: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr ""
 
@@ -2541,60 +2542,60 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2942,14 +2943,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Para: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2965,8 +2966,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Ekle"
@@ -2992,8 +2993,8 @@ msgstr "Çıkış"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3004,8 +3005,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4499,7 +4500,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -4515,7 +4516,7 @@ msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4942,7 +4943,7 @@ msgstr "Fısıltılara izin ver"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Sil"
@@ -5603,7 +5604,7 @@ msgstr "EKP"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -5615,8 +5616,8 @@ msgstr "ENV"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Envanter"
 
@@ -5628,8 +5629,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5725,7 +5726,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5746,8 +5747,8 @@ msgstr "AYR"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Tuş: %s"
@@ -5896,7 +5897,7 @@ msgstr "İsim:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5907,7 +5908,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5960,7 +5961,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6236,7 +6237,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6248,88 +6249,88 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Hepsi"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Takas yapılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Bırakılacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Saklanacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Depodan alınacak nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Bölünecek nesne miktarını seç."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Satın alma mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Satış mağazasına ekle."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Bilinmeyen."
 
@@ -6564,87 +6565,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "envanter yer çubuğu"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Gereklilik"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Onayla"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -6660,18 +6661,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Elbise: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Önce çıkart"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Uzak elbisesi"
 
@@ -6812,72 +6813,72 @@ msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Duyuru"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Duyuruda linkleri göster"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s sizden %s %s istiyor, kabul ediyor musunuz?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8434,16 +8435,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9439,6 +9430,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/uk.po b/po/uk.po
index 22aa58111..25bb1bd0c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -52,7 +52,7 @@ msgstr "Файл завантажено"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -64,43 +64,43 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
@@ -133,7 +133,7 @@ msgstr "Не вистачає назви гільдії."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Будь ласка, вкажіть гравця."
 
@@ -163,91 +163,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Гравця все позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Гравця позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Неможливо позначити гравця як \"%s\"!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Гравець не ігнорувався!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Гравець більше не ігнорується!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Не можна видалити цього гравця зі списку ігнорованих!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Гравець все стертий!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Гравця повернуто із порожнечі!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Не можна повернути цього стертого гравця!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "приятель"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "зневажити"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "нейтральний"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "чорний список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "супротивник"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -421,8 +421,8 @@ msgstr "Ти бачиш %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -507,12 +507,12 @@ msgstr "Довідка"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрити"
 
@@ -1218,7 +1218,7 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "Опритомнити"
 
@@ -1404,8 +1404,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1735,22 +1735,22 @@ msgstr "Створити групу"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1780,7 +1780,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "Торгівля"
 
@@ -1883,10 +1884,10 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "Придбати"
@@ -1901,10 +1902,10 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "Продати"
@@ -1914,7 +1915,7 @@ msgstr "Продати"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "Додати примітку"
 
@@ -1940,7 +1941,7 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
@@ -1981,7 +1982,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1998,7 +1999,7 @@ msgstr "Зняти"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Перейменувати"
 
@@ -2024,8 +2025,8 @@ msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
@@ -2037,8 +2038,8 @@ msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "Додати до чату"
 
@@ -2053,8 +2054,8 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "Видалити"
 
@@ -2078,8 +2079,8 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Швидке спорядження"
 
@@ -2104,7 +2105,7 @@ msgstr "Редагувати заклинання"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Скинути"
 
@@ -2157,8 +2158,8 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
@@ -2168,73 +2169,73 @@ msgid "Change guild position"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "вікно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "Відімкнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "Зафіксувати"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "Перейменувати            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "Ім'я:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "Примітка до гравця        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "Примітка:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "Додати до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "Додати до торгівлі 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "Додати половину до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "Додати все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "Додати всю кількість"
 
@@ -2243,66 +2244,66 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Зберегти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "Зберегти 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "Зберегти половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "Зберегти все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "Зберегти всю кількість"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "Вилучити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "Вилучити 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "Вилучити половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "Вилучити все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "Вилучити всю кількість"
 
@@ -2313,9 +2314,9 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2323,46 +2324,46 @@ msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2370,30 +2371,30 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "Показати вікно"
 
@@ -2401,8 +2402,8 @@ msgstr "Показати вікно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2410,134 +2411,134 @@ msgstr "Рівень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2545,60 +2546,60 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2946,14 +2947,14 @@ msgstr "Рівень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Кошти: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr "Вдяг."
 
@@ -2969,8 +2970,8 @@ msgstr "Відвідати посилання"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "Додати"
@@ -2996,8 +2997,8 @@ msgstr "Вийти"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3008,8 +3009,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4502,7 +4503,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "Крамниця"
 
@@ -4518,7 +4519,7 @@ msgstr "Ввімкнути режим крамниці"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4950,7 +4951,7 @@ msgstr "Дозволити шепіт (приватне спілкування)"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "Видалити"
@@ -5611,7 +5612,7 @@ msgstr "СПР"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "Спорядження"
 
@@ -5623,8 +5624,8 @@ msgstr "СУМ"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Сумка"
 
@@ -5636,8 +5637,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Візок"
 
@@ -5733,7 +5734,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5754,8 +5755,8 @@ msgstr "НАЛ"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "Клавіша: %s"
@@ -5904,7 +5905,7 @@ msgstr "Ім'я:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5915,7 +5916,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5968,7 +5969,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6249,7 +6250,7 @@ msgstr "Вставити"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6261,88 +6262,88 @@ msgid "Equip"
 msgstr "Вдягнути"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "Все"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "Вкажіть кількість предметів для торгівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "Вкажіть кількість предметів, щоб кинути."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "Вкажіть кількість предметів для зберігання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "Вкажіть кількість предметів для отримання."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "Вкажіть кількість предметів для розподілу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "Продавати до списку купівлі."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "Додати до списку продажу."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "Невідомо."
 
@@ -6579,87 +6580,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr "здоров'я"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "рівень мани"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "досвід"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "вага"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr "сумка"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "гаманець"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr "стріли"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "рядок стану"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr "рівень роботи"
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Рівень: %d (ГМ %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "Потрібно"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr "Рівень роботи: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr "Зупинити очікування"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "Далі"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "Відправити"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "Скинути"
 
@@ -6675,18 +6676,18 @@ msgid "Do you really want to sell %s?"
 msgstr "Ви дійсно бажаєте продати %s?"
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "Швидке спорядження: %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "Спочатку зняти"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr "Піжама"
 
@@ -6827,73 +6828,72 @@ msgid "Reset Windows"
 msgstr "Скинути налаштування вікон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "Особиста крамниця"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "Анонс"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "Посилання у анонсі"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
-#, fuzzy
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
-msgstr "Рух нагору"
+msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s бажає %s %s, підтримуєте пропозицію?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запит на торгівлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8448,16 +8448,6 @@ msgstr "Наступна вкладка сумки"
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "Сховище"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9057,9 +9047,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "Рівень гільдії: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9455,6 +9445,21 @@ msgstr "улюбленець"
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "Сховище"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
@@ -9866,9 +9871,8 @@ msgstr "Не вдалося завести улюбленця."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
-#, fuzzy
 msgid "Pet caught."
-msgstr "Улюбленця обрано."
+msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 88e05b82c..a7dda349b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-23 22:06+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -56,7 +56,7 @@ msgstr ""
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -68,43 +68,43 @@ msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr "公会名称缺失."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -507,12 +507,12 @@ msgstr "帮助"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -1216,7 +1216,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr ""
 
@@ -1400,8 +1400,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1731,22 +1731,22 @@ msgstr "建立"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1776,7 +1776,8 @@ msgstr ""
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "交易"
 
@@ -1879,10 +1880,10 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "购买"
@@ -1897,10 +1898,10 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "出售"
@@ -1910,7 +1911,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1936,7 +1937,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr ""
 
@@ -1977,7 +1978,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1994,7 +1995,7 @@ msgstr "卸下装备"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重命名"
 
@@ -2020,8 +2021,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -2033,8 +2034,8 @@ msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -2049,8 +2050,8 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr ""
 
@@ -2074,8 +2075,8 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "套装"
 
@@ -2100,7 +2101,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
@@ -2153,8 +2154,8 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2164,73 +2165,73 @@ msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "名称：                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr ""
 
@@ -2239,66 +2240,66 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2309,9 +2310,9 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2319,46 +2320,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr ""
 
@@ -2366,30 +2367,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr ""
 
@@ -2397,8 +2398,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2406,134 +2407,134 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "所有"
 
@@ -2541,60 +2542,60 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2942,14 +2943,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2965,8 +2966,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "添加"
@@ -2992,8 +2993,8 @@ msgstr "退出"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3004,8 +3005,8 @@ msgstr "+"
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr "-"
 
@@ -4496,7 +4497,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "商店"
 
@@ -4512,7 +4513,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4939,7 +4940,7 @@ msgstr "允许密语"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "删除"
@@ -5600,7 +5601,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "装备"
 
@@ -5612,8 +5613,8 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "物品栏"
 
@@ -5625,8 +5626,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5722,7 +5723,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5743,8 +5744,8 @@ msgstr "SET"
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr "按键：%s"
@@ -5893,7 +5894,7 @@ msgstr "姓名:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -5904,7 +5905,7 @@ msgstr ">"
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -5957,7 +5958,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6233,7 +6234,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6245,88 +6246,88 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr "全部"
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "请选择交易的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "请选择丢弃的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr "请选择存储的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr "请选择取回的物品数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "请选择你分离的物品的数量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr "添加到购买商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr "添加到出售商店."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr "未知."
 
@@ -6559,87 +6560,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr "法力栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr "经验条"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr "重量栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr "钱栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr "状态栏"
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr "需要"
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr "重置"
 
@@ -6655,18 +6656,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr "先卸掉装备"
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr ""
 
@@ -6807,72 +6808,72 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr "公布"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:991
+#, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr "%s想要%s %s 你接受吗?"
+msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
-#, fuzzy, c-format
+#: src/gui/windows/shopwindow.cpp:998
+#, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr "%s想要%s %s 你接受吗?"
+msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "请求交易"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8427,16 +8428,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr "仓库"
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9036,9 +9027,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "工会等级: %d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9434,6 +9425,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr "仓库"
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3bc0e11b9..a9d9dca40 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -50,7 +50,7 @@ msgstr "檔案上載成功"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -62,43 +62,43 @@ msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
@@ -129,7 +129,7 @@ msgstr "欠缺公會名稱."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已經 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能被 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "玩家沒有被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "玩家已經擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "玩家不再被擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "玩家不能被擦去!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "被忽略"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "被列入黑名單"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "冤家"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "配置數值:%s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "伺服器配置數值:%s"
@@ -415,8 +415,8 @@ msgstr "你看到 %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -501,12 +501,12 @@ msgstr "說明"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -1210,7 +1210,7 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "復活"
 
@@ -1394,8 +1394,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1725,22 +1725,22 @@ msgstr "選擇隊伍"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1770,7 +1770,8 @@ msgstr "卡片： "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "交易"
 
@@ -1873,10 +1874,10 @@ msgstr "對話"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "購買"
@@ -1891,10 +1892,10 @@ msgstr "購買"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "出售"
@@ -1904,7 +1905,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "添加評論"
 
@@ -1930,7 +1931,7 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
@@ -1971,7 +1972,7 @@ msgstr "丟棄"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1988,7 +1989,7 @@ msgstr "卸下裝備"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重新命名"
 
@@ -2014,8 +2015,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
@@ -2027,8 +2028,8 @@ msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "加至對話"
 
@@ -2043,8 +2044,8 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "清除"
 
@@ -2068,8 +2069,8 @@ msgstr "移動鏡頭"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "裝備"
 
@@ -2094,7 +2095,7 @@ msgstr "編輯咒語"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
@@ -2147,8 +2148,8 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
@@ -2158,73 +2159,73 @@ msgid "Change guild position"
 msgstr "改變公會職位"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "視窗"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "解鎖"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "鎖定"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "名字:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2233,66 +2234,66 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "儲存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "儲存 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "儲存 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "取回 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "取回 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2303,9 +2304,9 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2313,46 +2314,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "複製至對話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2360,30 +2361,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2391,8 +2392,8 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2400,134 +2401,134 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2535,60 +2536,60 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
@@ -2936,14 +2937,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2959,8 +2960,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "增加"
@@ -2986,8 +2987,8 @@ msgstr "離開"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -2998,8 +2999,8 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr ""
 
@@ -4490,7 +4491,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "商店"
 
@@ -4506,7 +4507,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4933,7 +4934,7 @@ msgstr "允許密語"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "刪除"
@@ -5594,7 +5595,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5606,8 +5607,8 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "背包"
 
@@ -5619,8 +5620,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5716,7 +5717,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5737,8 +5738,8 @@ msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -5887,7 +5888,7 @@ msgstr "名字:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -5898,7 +5899,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -5951,7 +5952,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6227,7 +6228,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6239,88 +6240,88 @@ msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr ""
 
@@ -6553,87 +6554,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "繼續"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr ""
 
@@ -6649,18 +6650,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr ""
 
@@ -6801,72 +6802,72 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
+#: src/gui/windows/shopwindow.cpp:991
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
+#: src/gui/windows/shopwindow.cpp:998
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8421,16 +8422,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9028,9 +9019,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "飢餓：%d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9426,6 +9417,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."
author	Andrei Karas <akaras@inbox.ru>	2016-01-08 23:23:39 +0300
committer	Andrei Karas <akaras@inbox.ru>	2016-01-08 23:23:39 +0300
commit	a640418f26f4fd38fe55671120dd643f30d52273 (patch)
tree	1e0564349b5afc2e6b3114d4c4cb541084c62ade
parent	c74a91d49f6afea0b23acc4d5b4543dfee5e64db (diff)
download	mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.gz mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.bz2 mv-a640418f26f4fd38fe55671120dd643f30d52273.tar.xz mv-a640418f26f4fd38fe55671120dd643f30d52273.zip