Update translations.

author: Andrei Karas <akaras@inbox.ru> 2016-01-29 16:40:03 +0300
committer: Andrei Karas <akaras@inbox.ru> 2016-01-29 16:40:03 +0300
commit: b4658b5317715e13f4294e5a8c60e20af8db0744 (patch)
tree: 802f2f7d60be896fd41d298e1b358529936c612f /po
parent: 05174b5178b28df4883f593f8105c74fa47bb8f4 (diff)
download: plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.gz
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.bz2
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.xz
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.zip
24 files changed, 8077 insertions, 7403 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 172bbcbbf..d819d9a8d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -131,6 +131,7 @@ src/input/inputmanager.cpp
 src/input/keyboardconfig.cpp
 src/input/pages/basic.cpp
 src/input/pages/chat.cpp
+src/input/pages/craft.cpp
 src/input/pages/emotes.cpp
 src/input/pages/gui.cpp
 src/input/pages/move.cpp
diff --git a/po/ca.po b/po/ca.po
index dfb15d4af..6154f5a22 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -36,7 +36,7 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -45,7 +45,7 @@ msgstr "Arxiu enviat"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -67,38 +67,38 @@ msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "El jugador ja és %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Relació canviada amb èxit, el jugador es ara %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "El jugador no pot ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estava ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "El jugador ja no està ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "El jugador no pot ser des-ignorat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Personatge ja esborrat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "El personatge no pot ser esborrat!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "amic"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "desatès"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -502,13 +502,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tancar"
 
@@ -558,7 +558,7 @@ msgstr "Canviant servidors de joc"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1722,24 +1722,24 @@ msgstr "Crear grup"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1771,7 +1771,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1786,8 +1786,8 @@ msgstr "Intercanvi"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1799,41 +1799,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr ""
 
@@ -1850,10 +1850,10 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Moure"
 
@@ -1861,8 +1861,8 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parlar"
 
@@ -1876,11 +1876,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1894,11 +1894,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1906,26 +1906,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr ""
 
@@ -1933,19 +1933,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1953,19 +1953,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1973,8 +1973,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1990,14 @@ msgstr "Des-equipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2005,38 +2005,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Element del mapa"
 
@@ -2046,22 +2046,22 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2070,77 +2070,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Conjunt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Conjurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Activa resaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Borrar nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Habilitar absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Des-habilita absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Deixa"
 
@@ -2150,84 +2150,84 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nom:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -2236,66 +2236,73 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Mou-te al Objectiu"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -2306,56 +2313,56 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2363,30 +2370,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2394,7 +2401,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2403,134 +2410,135 @@ msgstr "Nivell: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2538,64 +2546,71 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Mou-te al Objectiu"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2608,13 +2623,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Dreceres"
 
@@ -2622,15 +2637,21 @@ msgstr "Dreceres"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2639,7 +2660,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Xat"
@@ -2650,7 +2671,7 @@ msgstr "Xat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2661,7 +2682,7 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2939,14 +2960,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3034,7 +3055,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
@@ -3122,13 +3143,13 @@ msgid "%s whispers: %s"
 msgstr "%s xiuxiueigs: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4111,37 +4132,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Assignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Des-assignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Per defecte"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicte de tecla(es) detectat."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4152,8 +4173,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4495,7 +4516,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Botiga"
 
@@ -5560,7 +5581,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5604,7 +5625,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipament"
 
@@ -5616,7 +5637,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventari"
@@ -5629,7 +5650,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Motxilla"
@@ -5646,7 +5667,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Habilitats"
 
@@ -5783,7 +5804,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
@@ -5889,99 +5910,100 @@ msgstr ""
 msgid "Name:"
 msgstr "Nom:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Distribueix %d punts"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Color de cabells:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Pentinat:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Distribueix %d punts"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Has de treure %d punts"
@@ -6237,7 +6259,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6271,27 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6889,42 +6911,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Aumentar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7610,6 +7632,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Drecera del objecte  %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8605,7 +8637,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
+msgid "Client too old or wrong server type."
 msgstr ""
 
 #. TRANSLATORS: error message
@@ -9010,7 +9042,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Objecte desconegut"
 
@@ -9030,7 +9062,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9281,157 +9313,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9445,11 +9477,6 @@ msgstr "Emmagatzematge"
 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 36a6fa85c..c2c9ea7de 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
@@ -41,7 +41,7 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -50,7 +50,7 @@ msgstr "Soubor byl uploadován"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -72,38 +72,38 @@ msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, 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:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Hráč již není smazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "přítel"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "přehlížený"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutrální"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "na černé listině"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "nepřítel"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -507,13 +507,13 @@ msgstr "Nápověda"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
@@ -563,7 +563,7 @@ msgstr "Vyměňuji herní servery"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1729,24 +1729,24 @@ msgstr "Vytvořit partu"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1778,7 +1778,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1793,8 +1793,8 @@ msgstr "Obchod"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1806,41 +1806,41 @@ msgstr "Útok"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Vyhladit"
 
@@ -1857,10 +1857,10 @@ msgstr "Vyhladit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Jdi sem"
 
@@ -1868,8 +1868,8 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Promluv"
 
@@ -1883,11 +1883,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1901,11 +1901,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1913,26 +1913,26 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Vyřadit ze seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Přidat do prioritního seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Přidat do seznamu útoku"
 
@@ -1940,19 +1940,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Přesunout k veliteli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Oheň"
 
@@ -1960,19 +1960,19 @@ msgstr "Oheň"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Nakrmit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Zabít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Upustit kořist"
 
@@ -1980,8 +1980,8 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1997,14 @@ msgstr "Odebrat z vybavení"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Přejmenovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Vrátit k vejci"
 
@@ -2012,38 +2012,38 @@ msgstr "Vrátit k vejci"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Označit na mapě"
 
@@ -2053,22 +2053,22 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
@@ -2077,77 +2077,77 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Opustit"
 
@@ -2157,84 +2157,84 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -2243,66 +2243,73 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 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:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Přesunout k veliteli"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 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:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2313,56 +2320,56 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2370,30 +2377,30 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Zobrazit okno"
 
@@ -2401,7 +2408,7 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2410,134 +2417,135 @@ msgstr "Úroveň: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 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:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 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:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2545,64 +2553,71 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Přesunout k veliteli"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2615,13 +2630,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Zkladní"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Zkratky"
 
@@ -2629,15 +2644,21 @@ msgstr "Zkratky"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Smajlíci"
@@ -2646,7 +2667,7 @@ msgstr "Smajlíci"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2657,7 +2678,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2668,7 +2689,7 @@ msgid "Other"
 msgstr "Ostatní"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Ovládání"
 
@@ -2946,14 +2967,14 @@ msgstr "Úroveň: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Ob."
 
@@ -3041,7 +3062,7 @@ msgstr "Upravit"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
@@ -3129,13 +3150,13 @@ msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s je nyní připojen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s se právě odpojil."
@@ -4118,37 +4139,37 @@ msgid "Alpha:"
 msgstr "Průhlednost:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Přiřadit"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Odebrat"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Výchozí"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetovat všecky klávesy"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Vstup"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Kolize kláves detekována/y."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4159,8 +4180,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "neznámý"
 
@@ -4502,7 +4523,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Obchod"
 
@@ -5572,7 +5593,7 @@ msgstr "ÚK"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Úkoly"
 
@@ -5616,7 +5637,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -5628,7 +5649,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventář"
@@ -5641,7 +5662,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Košík"
@@ -5658,7 +5679,7 @@ msgstr "DOV"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -5795,7 +5816,7 @@ msgstr "Počet:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvořit"
@@ -5901,99 +5922,100 @@ msgstr "Nová postava"
 msgid "Name:"
 msgstr "Jméno:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Rozdělte prosím %d bodů"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Barva vlasů:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Účes:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Rozdělte prosím %d bodů"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Vzhled:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "P"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -6254,7 +6276,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6288,27 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6908,42 +6930,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7627,6 +7649,16 @@ msgid "Show smiles"
 msgstr "Zobrazit smajlíky"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Zkratka výbavy %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Modifikátory smajlíkových kláves"
@@ -8626,8 +8658,8 @@ msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Klientský software je příliš starý."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9033,7 +9065,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
@@ -9053,7 +9085,7 @@ msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9304,157 +9336,157 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nepojmenovaný"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritický útok %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Magický útok %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritická obrana %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Magiská obrana %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "BM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Úroveň %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Rychlost %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Dosah %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Útěk %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "mazlíček"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9468,11 +9500,6 @@ msgstr "Sklad"
 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."
@@ -10438,3 +10465,6 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
+
+#~ msgid "Client too old."
+#~ msgstr "Klientský software je příliš starý."
diff --git a/po/de.po b/po/de.po
index a8c204312..38dbf8316 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
@@ -61,7 +61,7 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -70,7 +70,7 @@ msgstr "Datei hochgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -92,38 +92,38 @@ msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Spieler ist nicht mehr gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "Freund"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "missachtet"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "Feind"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr "Schnellnachricht"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr "Konfigurationswert: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -528,13 +528,13 @@ msgstr "Hilfe"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
@@ -584,7 +584,7 @@ msgstr "Spielserver wechseln"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1757,24 +1757,24 @@ msgstr "Gruppe erstellen"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1806,7 +1806,7 @@ msgstr "Karten: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1821,8 +1821,8 @@ msgstr "Handeln"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1834,41 +1834,41 @@ msgstr "Angriff"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Atombombe"
 
@@ -1885,10 +1885,10 @@ msgstr "Atombombe"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Bewegen"
 
@@ -1896,8 +1896,8 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -1911,11 +1911,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1929,11 +1929,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1941,26 +1941,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Aus Angriffsliste entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Zur bevorzugten Angriffsliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Zur Angriffsliste hinzufügen"
 
@@ -1968,19 +1968,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Zum Meister bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Feuern"
 
@@ -1988,19 +1988,19 @@ msgstr "Feuern"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Füttern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Töten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Beute wegwerfen"
 
@@ -2008,8 +2008,8 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2025,14 @@ msgstr "Ablegen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Umbenennen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Zum Ei zurückkehren"
 
@@ -2040,38 +2040,38 @@ msgstr "Zum Ei zurückkehren"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Name zum Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Kartengegenstand"
 
@@ -2081,22 +2081,22 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Kamera bewegen"
 
@@ -2105,77 +2105,77 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Ausrüstungset"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Zauberspruch bearbeiten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Namen nicht löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Namen löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Abwesendheitsmodus aktvieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Abwesendheitsmodus deaktiveren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -2185,84 +2185,84 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "Fenster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Entsperren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Sperren"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Name:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -2271,66 +2271,73 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Alles -1 ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Zum Meister bewegen"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Alles -1 aufnehmen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2341,56 +2348,56 @@ msgstr "Alles abholen"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2398,30 +2405,30 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
@@ -2429,7 +2436,7 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2438,134 +2445,135 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2573,64 +2581,71 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Zum Meister bewegen"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2643,13 +2658,13 @@ msgid "Level: Unknown"
 msgstr "Level: Unbekannt"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Normal"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Kurzbefehle"
 
@@ -2657,15 +2672,21 @@ msgstr "Kurzbefehle"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenster"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Gefühle"
@@ -2674,7 +2695,7 @@ msgstr "Gefühle"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2685,7 +2706,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2696,7 +2717,7 @@ msgid "Other"
 msgstr "Sonstiges"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "GUI"
 
@@ -2974,14 +2995,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3069,7 +3090,7 @@ msgstr "Ändern"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3157,13 +3178,13 @@ msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -4280,37 +4301,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Zuweisen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Zuweisen rückgängig machen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Standard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Alle Tastenbelegungen zurücksetzen"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Eingabe"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Tastenkonflikt erkannt."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4321,8 +4342,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -4664,7 +4685,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Laden"
 
@@ -5741,7 +5762,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Quests"
 
@@ -5785,7 +5806,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -5797,7 +5818,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventar"
@@ -5810,7 +5831,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Einkaufswagen"
@@ -5827,7 +5848,7 @@ msgstr "FÄH"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -5964,7 +5985,7 @@ msgstr "Menge:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Erstellen"
@@ -6070,99 +6091,100 @@ msgstr "Neuer Charakter"
 msgid "Name:"
 msgstr "Name:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Bitte verteile %d Punkte"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Haarfarbe:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Frisur:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Bitte verteile %d Punkte"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Rasse:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Schau:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "W"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Charakterattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -6423,7 +6445,7 @@ msgstr "Einfügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6435,27 +6457,27 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
@@ -7075,42 +7097,42 @@ msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Hoch"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitenset %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Text zum Skill %s hinzufügen"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr "Text: "
 
@@ -7796,6 +7818,16 @@ msgid "Show smiles"
 msgstr "Smilies anzeigen"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Ausrüstungset Kurzbefehl %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Emote Modifikationstasten"
@@ -8796,8 +8828,8 @@ msgstr "Du wurdest für immer vom Spiel gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Client ist zu alt."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9203,7 +9235,7 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -9223,7 +9255,7 @@ msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Du hast eine neue Nachricht von %s mit dem Betreff %s"
@@ -9474,157 +9506,157 @@ msgstr "Modernes OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Unbenannt"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Angriff %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr "Min Angriff %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr "Max Angriff %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritscher Angriff %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "M. Angriff %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Verteidigung %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr "Min Verteidigung %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr "Max Verteidigung %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritsche Verteidigung %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Min M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Max M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr "Max HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr "Max MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Geschwindigkeit %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Reichweite %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Flucht %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr "Min Flucht %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr "Max Flucht %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr "Kartenslots %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "Haustier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Fähigkeit"
 
@@ -9638,11 +9670,6 @@ msgstr "Lager"
 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."
@@ -10626,3 +10653,6 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
+
+#~ msgid "Client too old."
+#~ msgstr "Client ist zu alt."
diff --git a/po/es.po b/po/es.po
index a87742162..8588a2ec6 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-20 22:17+0300\n"
-"PO-Revision-Date: 2016-01-17 11:24+0000\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
+"PO-Revision-Date: 2016-01-22 12:35+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
@@ -48,7 +48,7 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -57,7 +57,7 @@ msgstr "Archivo subido"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -79,38 +79,38 @@ msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Relación cambiada exitosamente! ¡El jugador ahora es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "¡El jugador no fue ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "¡El jugador ya no se encuentra borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "amigo"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "desatendido"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "en la lista negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "enemigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr "Mensaje rápido"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr "Valor de configuración: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -514,13 +514,13 @@ msgstr "Ayuda"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
@@ -570,7 +570,7 @@ msgstr "Cambiando servidores del juego"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1740,24 +1740,24 @@ msgstr "Crear grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1789,7 +1789,7 @@ msgstr "Tarjetas: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1804,8 +1804,8 @@ msgstr "Intercambio"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1817,41 +1817,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Eliminar"
 
@@ -1868,10 +1868,10 @@ msgstr "Eliminar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
 
@@ -1879,8 +1879,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Hablar"
 
@@ -1894,11 +1894,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1912,11 +1912,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -1924,26 +1924,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -1951,19 +1951,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Moverse al maestro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Fuego"
 
@@ -1971,19 +1971,19 @@ msgstr "Fuego"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Alimentar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Soltar botín"
 
@@ -1991,8 +1991,8 @@ msgstr "Soltar botín"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2008,14 @@ msgstr "Quitárselo"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renombrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Regresar al huevo"
 
@@ -2023,38 +2023,38 @@ msgstr "Regresar al huevo"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
@@ -2064,22 +2064,22 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Saltar a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -2088,77 +2088,77 @@ msgstr "Mover cámara"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Dejar"
 
@@ -2168,84 +2168,84 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -2254,66 +2254,73 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Moverse al maestro"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2324,56 +2331,56 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2381,30 +2388,30 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar ventana"
 
@@ -2412,7 +2419,7 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2421,134 +2428,135 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2556,64 +2564,71 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Moverse al maestro"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2626,13 +2641,13 @@ msgid "Level: Unknown"
 msgstr "Nivel: Desconocido"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atajos"
 
@@ -2640,15 +2655,21 @@ msgstr "Atajos"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Ventanas"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emotes"
@@ -2657,7 +2678,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2668,7 +2689,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2679,7 +2700,7 @@ msgid "Other"
 msgstr "Otro"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Interfaz"
 
@@ -2957,14 +2978,14 @@ msgstr "Nivel: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3052,7 +3073,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -3140,13 +3161,13 @@ msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -4162,37 +4183,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Asignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Predeterminado"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Detectado conflicto de teclas."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4203,8 +4224,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "Desconocido"
 
@@ -4546,7 +4567,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Tienda"
 
@@ -5618,7 +5639,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Misiones"
 
@@ -5662,7 +5683,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -5674,7 +5695,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
@@ -5687,7 +5708,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Mochila"
@@ -5704,7 +5725,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -5841,7 +5862,7 @@ msgstr "Cantidad:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
@@ -5951,99 +5972,100 @@ msgstr "Nuevo Personaje"
 msgid "Name:"
 msgstr "Nombre:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Por favor, distribuye %d puntos"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Color de cabello:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Peinado:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor, distribuye %d puntos"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Raza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Apariencia:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -6305,7 +6327,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6317,27 +6339,27 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
@@ -6370,7 +6392,7 @@ msgstr "Selecciona la cantidad de artículos a enviar."
 #. TRANSLATORS: amount window message
 #: src/gui/windows/itemamountwindow.cpp:269
 msgid "Select amount of items to craft."
-msgstr ""
+msgstr "Selecciona la cantidad de artículos a crear."
 
 #. TRANSLATORS: amount window message
 #: src/gui/windows/itemamountwindow.cpp:274
@@ -6959,42 +6981,42 @@ msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Añadir texto a la habilidad %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7680,6 +7702,16 @@ msgid "Show smiles"
 msgstr "Mostrar sonrisas"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Atajo a la Vestimenta %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Teclas de emotes modificadoras"
@@ -8681,8 +8713,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Cliente es demasiado antiguo."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9088,7 +9120,7 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -9108,7 +9140,7 @@ msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Tienes un nuevo correo de %s, con el asunto %s"
@@ -9359,157 +9391,157 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr "Ataque mínimo %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr "Ataque máximo %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque mágico %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr "Defensa mínima %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr "Defensa máxima %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defensa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defensa mágica %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Defensa Mágica Mínima %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Defensa Mágica Máxima %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr "HP Máximo %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr "Máximo MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Nivel %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidad %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Escaparse %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr "Mínima evasión %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr "áxima evasión %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr "Ranuras de cartas %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "mascota"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "habilidad"
 
@@ -9523,11 +9555,6 @@ msgstr "Almacenamiento"
 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."
@@ -10504,3 +10531,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Client too old."
+#~ msgstr "Cliente es demasiado antiguo."
diff --git a/po/fi.po b/po/fi.po
index db5abbc44..31b3ce30f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -36,7 +36,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -45,7 +45,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -67,38 +67,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "ystävä"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "vaimennettu"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutraali"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "mustalistattu"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "vihollinen"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -501,13 +501,13 @@ msgstr "Apua"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
@@ -557,7 +557,7 @@ msgstr "Vaihdan pelipalvelinta"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1722,24 +1722,24 @@ msgstr "Luo ryhmä"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1771,7 +1771,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1786,8 +1786,8 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1799,41 +1799,41 @@ msgstr "Hyökkää"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Pommita"
 
@@ -1850,10 +1850,10 @@ msgstr "Pommita"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Liiku"
 
@@ -1861,8 +1861,8 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -1876,11 +1876,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Osta"
 
@@ -1894,11 +1894,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Myy"
 
@@ -1906,26 +1906,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1933,19 +1933,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1953,19 +1953,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1973,8 +1973,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1990,14 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2005,38 +2005,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Karttaolio"
 
@@ -2046,22 +2046,22 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2070,77 +2070,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Eroa"
 
@@ -2150,84 +2150,84 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -2236,66 +2236,73 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Mene kohteen luo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2306,56 +2313,56 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2363,30 +2370,30 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2394,7 +2401,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2403,134 +2410,135 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2538,64 +2546,71 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Mene kohteen luo"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2608,13 +2623,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Pikavalinnat"
 
@@ -2622,15 +2637,21 @@ msgstr "Pikavalinnat"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2639,7 +2660,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
@@ -2650,7 +2671,7 @@ msgstr "Keskustelu"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2661,7 +2682,7 @@ msgid "Other"
 msgstr "Muu"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2939,14 +2960,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3034,7 +3055,7 @@ msgstr "Muokkaa"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -3122,13 +3143,13 @@ msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4111,37 +4132,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Aseta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Poista asetus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Oletus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4152,8 +4173,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4495,7 +4516,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -5556,7 +5577,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5600,7 +5621,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -5612,7 +5633,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Tavarat"
@@ -5625,7 +5646,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Kärry"
@@ -5642,7 +5663,7 @@ msgstr "Tai"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Taidot"
 
@@ -5779,7 +5800,7 @@ msgstr "Määrä:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Luo"
@@ -5885,99 +5906,100 @@ msgstr ""
 msgid "Name:"
 msgstr "Nimi:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Jaa %d pistettä"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Jaa %d pistettä"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Rotu:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -6233,7 +6255,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6267,27 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6885,42 +6907,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7604,6 +7626,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Tavarapikavalinta %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8600,8 +8632,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Liian vanha asiakasohjelma."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9007,7 +9039,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -9027,7 +9059,7 @@ msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9278,157 +9310,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9442,11 +9474,6 @@ msgstr "Varasto"
 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."
@@ -10415,3 +10442,6 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Client too old."
+#~ msgstr "Liian vanha asiakasohjelma."
diff --git a/po/fr.po b/po/fr.po
index dc3a1df6b..491614b84 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
@@ -50,7 +50,7 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -59,7 +59,7 @@ msgstr "Fichier mis en ligne"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -81,38 +81,38 @@ msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur %s avec succès !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 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:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Joueur plus maintenant effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Le joueur n'a pas pu être effacé !"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "ami"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "écarté"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutre"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "sous liste noire"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "ennemi"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr "Message Rapide"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -518,13 +518,13 @@ msgstr "Aide"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
@@ -574,7 +574,7 @@ msgstr "Changement de serveur de jeu"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1751,24 +1751,24 @@ msgstr "Créer un groupe"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1800,7 +1800,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1815,8 +1815,8 @@ msgstr "Échange"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1828,41 +1828,41 @@ msgstr "Attaquer"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Éjecter de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Annihiler"
 
@@ -1879,10 +1879,10 @@ msgstr "Annihiler"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Déplacement"
 
@@ -1890,8 +1890,8 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parler"
 
@@ -1905,11 +1905,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1923,11 +1923,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1935,26 +1935,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -1962,19 +1962,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Aller jusqu'au maître"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Feu"
 
@@ -1982,19 +1982,19 @@ msgstr "Feu"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Nourrir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Tuer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Déposer le butin"
 
@@ -2002,8 +2002,8 @@ msgstr "Déposer le butin"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2019,14 @@ msgstr "Retirer"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renommer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Retourner à l'œuf"
 
@@ -2034,38 +2034,38 @@ msgstr "Retourner à l'œuf"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Objet de carte"
 
@@ -2075,22 +2075,22 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -2099,77 +2099,77 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 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:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Quitter"
 
@@ -2179,84 +2179,84 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nom :                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -2265,66 +2265,73 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Aller jusqu'au maître"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2335,56 +2342,56 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 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:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2392,30 +2399,30 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
@@ -2423,7 +2430,7 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2432,134 +2439,135 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Déposer tout"
 
@@ -2567,64 +2575,71 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Aller jusqu'au maître"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2637,13 +2652,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Basique"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Raccourcis"
 
@@ -2651,15 +2666,21 @@ msgstr "Raccourcis"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fenêtres"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emoticônes"
@@ -2668,7 +2689,7 @@ msgstr "Emoticônes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Conversation"
@@ -2679,7 +2700,7 @@ msgstr "Conversation"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2690,7 +2711,7 @@ msgid "Other"
 msgstr "Autre"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Interface utilisateur (IU)"
 
@@ -2968,14 +2989,14 @@ msgstr "Niveau : %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3063,7 +3084,7 @@ msgstr "Éditer"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -3151,13 +3172,13 @@ msgid "%s whispers: %s"
 msgstr "Message privé de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -4142,37 +4163,37 @@ msgid "Alpha:"
 msgstr "Opacité :"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Assigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Désassigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Par défaut"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Réinitialiser toutes les touches"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Entrée"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4183,8 +4204,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "inconnu"
 
@@ -4526,7 +4547,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Boutique"
 
@@ -5605,7 +5626,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Quêtes"
 
@@ -5649,7 +5670,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -5661,7 +5682,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaire"
@@ -5674,7 +5695,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Panier"
@@ -5691,7 +5712,7 @@ msgstr "Cmp"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Compétences"
 
@@ -5828,7 +5849,7 @@ msgstr "Montant :"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Créer"
@@ -5934,99 +5955,100 @@ msgstr "Nouveau Personnage"
 msgid "Name:"
 msgstr "Nom :"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Distribues %d points"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Couleur :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Coupe :"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Distribues %d points"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Race :"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Apparence :"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr "H"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr "I"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -6287,7 +6309,7 @@ msgstr "Insérer"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6299,27 +6321,27 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6939,42 +6961,42 @@ msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7664,6 +7686,16 @@ msgid "Show smiles"
 msgstr "Afficher les sourires"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Raccourci de tenue %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Touches des modificateurs d'émoticône"
@@ -8665,8 +8697,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Client trop ancien."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9072,7 +9104,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -9092,7 +9124,7 @@ msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9343,157 +9375,157 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr "Attaque Mini %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr "Attaque Max %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Attaque critique %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Attaque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr "Défense Mini %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr "Défense Max %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Défense critique %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Défense M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Défense M. Mini %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Défense M. Max %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr "PV Max %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr "PM Max %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Niveau %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Vitesse %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Portée %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Fuir %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr "Fuite Mini %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr "Fuite Max %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "familier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9507,11 +9539,6 @@ msgstr "Entrepôt"
 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."
@@ -10491,3 +10518,6 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
+
+#~ msgid "Client too old."
+#~ msgstr "Client trop ancien."
diff --git a/po/id.po b/po/id.po
index 8ac621daf..25a2aaa3a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -40,7 +40,7 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -49,7 +49,7 @@ msgstr "Data telah terunggah"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -71,38 +71,38 @@ msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain berhasil %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Pemain belum lama telah dihapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "teman"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "diabaikan"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "netral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "daftar hitam"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "musuh"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -505,13 +505,13 @@ msgstr "Bantuan"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
@@ -561,7 +561,7 @@ msgstr "Mengganti server"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1726,24 +1726,24 @@ msgstr "Buat kelompok"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "Dagang"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "Serang"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Bisikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Sembunyikan"
 
@@ -1854,10 +1854,10 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Jalan"
 
@@ -1865,8 +1865,8 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -1880,11 +1880,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Beli"
 
@@ -1898,11 +1898,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Jual"
 
@@ -1910,26 +1910,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Tambah komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar serang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Tambah ke daftar serangan prioritas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Tambah ke daftar serangan"
 
@@ -1937,19 +1937,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Berjalan ke master"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Api"
 
@@ -1957,19 +1957,19 @@ msgstr "Api"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Beri makan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Bunuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Jatuhkan rampasan"
 
@@ -1977,8 +1977,8 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1994,14 @@ msgstr "Lepaskan"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ubah nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Kembali ke telur"
 
@@ -2009,38 +2009,38 @@ msgstr "Kembali ke telur"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Tambah nama ke obrolan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Item Peta"
 
@@ -2050,22 +2050,22 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Jebakan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Gerakkan kamera"
 
@@ -2074,77 +2074,77 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Perlengkapan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Jangan hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Aktifkan keluar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Nonaktifkan keluar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Meninggalkan"
 
@@ -2154,84 +2154,84 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "jendela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Buka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Tutup"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nama:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Tambah ke dagangan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Tambah semua ke dagangan"
 
@@ -2240,66 +2240,73 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Simpan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Simpan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Simpan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Simpan semua"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Berjalan ke master"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Ambil semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2310,56 +2317,56 @@ msgstr "Ambil semua"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2367,30 +2374,30 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Tampil jendela"
 
@@ -2398,7 +2405,7 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2407,134 +2414,135 @@ msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2542,64 +2550,71 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Berjalan ke master"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2612,13 +2627,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Dasar"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Tombol cepat"
 
@@ -2626,15 +2641,21 @@ msgstr "Tombol cepat"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Jendela"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emosi"
@@ -2643,7 +2664,7 @@ msgstr "Emosi"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Obrolan"
@@ -2654,7 +2675,7 @@ msgstr "Obrolan"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2665,7 +2686,7 @@ msgid "Other"
 msgstr "Lain"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Gui"
 
@@ -2943,14 +2964,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3038,7 +3059,7 @@ msgstr "Ubah"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3126,13 +3147,13 @@ msgid "%s whispers: %s"
 msgstr "%s membisikkan: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s sekarang Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s sekarang Offline."
@@ -4115,37 +4136,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Tetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Batal menetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Asal"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Reset semua key"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Masukan"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Konflik key terdeteksi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4154,8 +4175,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "tak diketahui"
 
@@ -4497,7 +4518,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Toko"
 
@@ -5557,7 +5578,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5601,7 +5622,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -5613,7 +5634,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -5626,7 +5647,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5643,7 +5664,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -5780,7 +5801,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Buat"
@@ -5886,99 +5907,100 @@ msgstr ""
 msgid "Name:"
 msgstr "Nama:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Tolong distribusikan %d point"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Warna rambut:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Gaya rambut:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Tolong distribusikan %d point"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -6234,7 +6256,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6246,27 +6268,27 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6884,42 +6906,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7603,6 +7625,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, c-format
+msgid "Craft shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8598,8 +8630,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Versi yang digunakan sudah kadaluarsa."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9003,7 +9035,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr ""
 
@@ -9023,7 +9055,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9274,157 +9306,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9438,11 +9470,6 @@ msgstr "Tempat penyimpanan"
 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."
@@ -10409,3 +10436,6 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
+
+#~ msgid "Client too old."
+#~ msgstr "Versi yang digunakan sudah kadaluarsa."
diff --git a/po/it.po b/po/it.po
index 1e47bebbd..40cace568 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
@@ -45,7 +45,7 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -54,7 +54,7 @@ msgstr "File caricato"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -76,38 +76,38 @@ msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "Amico"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "Disprezzato"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "Neutrale"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "nella lista nera"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "nemico"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -511,13 +511,13 @@ msgstr "Aiuto"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
@@ -567,7 +567,7 @@ msgstr "Cambiamento server del gioco"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(default)"
 
@@ -1737,24 +1737,24 @@ msgstr "Crea gruppo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1786,7 +1786,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1801,8 +1801,8 @@ msgstr "Commercia"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1814,41 +1814,41 @@ msgstr "Attacco"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nascondi"
 
@@ -1865,10 +1865,10 @@ msgstr "Nascondi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Movimento"
 
@@ -1876,8 +1876,8 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Parla"
 
@@ -1891,11 +1891,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Compra"
 
@@ -1909,11 +1909,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1921,26 +1921,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Rimuovi dalla lista Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Aggiungi alla lista Attacco - Priorità"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1948,19 +1948,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1968,19 +1968,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1988,8 +1988,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2005,14 @@ msgstr "Togli"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Rinomina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2020,38 +2020,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
@@ -2061,22 +2061,22 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -2085,77 +2085,77 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lascia"
 
@@ -2165,84 +2165,84 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -2251,66 +2251,73 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Muovi all'obbiettivo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2321,56 +2328,56 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2378,30 +2385,30 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostra Finestra"
 
@@ -2409,7 +2416,7 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2418,134 +2425,135 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2553,64 +2561,71 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Muovi all'obbiettivo"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2623,13 +2638,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Base"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
@@ -2637,15 +2652,21 @@ msgstr "Shortcuts"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Finestre"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Faccine"
@@ -2654,7 +2675,7 @@ msgstr "Faccine"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2665,7 +2686,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2676,7 +2697,7 @@ msgid "Other"
 msgstr "Altro"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2954,14 +2975,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3049,7 +3070,7 @@ msgstr "Modifica"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3137,13 +3158,13 @@ msgid "%s whispers: %s"
 msgstr "%s sussurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4126,37 +4147,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Imposta"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Annullare l'assegnazione"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Predefinito"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetta tutte le scorciatoie"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Input"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4167,8 +4188,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -4510,7 +4531,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Negozio"
 
@@ -5576,7 +5597,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Missioni"
 
@@ -5620,7 +5641,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -5632,7 +5653,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventario"
@@ -5645,7 +5666,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrello"
@@ -5662,7 +5683,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Abilità"
 
@@ -5799,7 +5820,7 @@ msgstr "Quantita':"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crea"
@@ -5905,99 +5926,100 @@ msgstr "Nuovo Personaggio"
 msgid "Name:"
 msgstr "Nome:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Distribuire %d punti"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Colore dei capelli:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Taglio di capelli:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Distribuire %d punti"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Razza:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -6253,7 +6275,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6287,27 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6905,42 +6927,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7626,6 +7648,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Scorciatoia %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8623,8 +8655,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Versione del Client obsoleta."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9030,7 +9062,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -9050,7 +9082,7 @@ msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9301,157 +9333,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9465,11 +9497,6 @@ msgstr "Magazzino"
 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."
@@ -10437,3 +10464,6 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
+
+#~ msgid "Client too old."
+#~ msgstr "Versione del Client obsoleta."
diff --git a/po/ja.po b/po/ja.po
index 28b796fe3..c36bc7cda 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -41,7 +41,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -50,7 +50,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -72,38 +72,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーを完全無視できませんでした!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "プレイヤーを完全無視解除しました!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "プレイヤーを完全無視解除できませんでした!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "友達"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "無視"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "中性"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "敵"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -505,13 +505,13 @@ msgstr "ヘルプ"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -561,7 +561,7 @@ msgstr "ゲームサーバーを変更しています"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1728,24 +1728,24 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1777,7 +1777,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1792,8 +1792,8 @@ msgstr "トレード"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1805,41 +1805,41 @@ msgstr "攻撃"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "消す"
 
@@ -1856,10 +1856,10 @@ msgstr "消す"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "動く"
 
@@ -1867,8 +1867,8 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "話す"
 
@@ -1882,11 +1882,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "買う"
 
@@ -1900,11 +1900,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "売る"
 
@@ -1912,26 +1912,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1939,19 +1939,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1959,19 +1959,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1979,8 +1979,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1996,14 @@ msgstr "取外す"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "名前を変更する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2011,38 +2011,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "マップアイテム"
 
@@ -2052,22 +2052,22 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -2076,77 +2076,77 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "退会"
 
@@ -2156,84 +2156,84 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -2242,66 +2242,73 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "ターゲットまで移動"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2312,56 +2319,56 @@ msgstr "全部取出す"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2369,30 +2376,30 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2400,7 +2407,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2409,134 +2416,135 @@ msgstr "レベル: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2544,64 +2552,71 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "ターゲットまで移動"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2614,13 +2629,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "ショートカット"
 
@@ -2628,15 +2643,21 @@ msgstr "ショートカット"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "ウィンドウ"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "スマイリー"
@@ -2645,7 +2666,7 @@ msgstr "スマイリー"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "チャット"
@@ -2656,7 +2677,7 @@ msgstr "チャット"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2667,7 +2688,7 @@ msgid "Other"
 msgstr "その他"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "GUI"
 
@@ -2945,14 +2966,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "装着."
 
@@ -3040,7 +3061,7 @@ msgstr "編集"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3128,13 +3149,13 @@ msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4117,37 +4138,37 @@ msgid "Alpha:"
 msgstr "アルファ:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "割り当てる"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "割り当て解除"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "標準に戻す"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "全てのキーをリセット"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "入力"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "ショートカットキーが重複しています."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4158,8 +4179,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "不明"
 
@@ -4501,7 +4522,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "店"
 
@@ -5561,7 +5582,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "クエスト"
 
@@ -5605,7 +5626,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "装着品"
 
@@ -5617,7 +5638,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "インベントリー"
@@ -5630,7 +5651,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "カート"
@@ -5647,7 +5668,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "スキル"
 
@@ -5784,7 +5805,7 @@ msgstr "量:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "作成"
@@ -5890,99 +5911,100 @@ msgstr "新しいキャラクター"
 msgid "Name:"
 msgstr "名前:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "%d ポイントを振り分けてください"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "髪色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "ヘアスタイル:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "%d ポイントを振り分けてください"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "人種:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "友達"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -6238,7 +6260,7 @@ msgstr "挿入"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6272,27 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6888,42 +6910,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7609,6 +7631,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "服装ショートカット %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "スマイリー編集キー"
@@ -8606,8 +8638,8 @@ msgstr "ゲームから永久追放されました。詳細はGMチームへ連�
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "アップデートが必要です."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9013,7 +9045,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -9033,7 +9065,7 @@ msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9284,157 +9316,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9448,11 +9480,6 @@ msgstr "倉庫"
 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."
@@ -10420,3 +10447,6 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Client too old."
+#~ msgstr "アップデートが必要です."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 66c27972e..7acc25f99 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-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+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"
@@ -34,7 +34,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -43,7 +43,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -65,38 +65,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr ""
 
@@ -157,91 +157,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr ""
 
@@ -499,13 +499,13 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -555,7 +555,7 @@ msgstr ""
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1719,24 +1719,24 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1768,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1783,8 +1783,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1796,41 +1796,41 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr ""
 
@@ -1847,10 +1847,10 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr ""
 
@@ -1858,8 +1858,8 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr ""
 
@@ -1873,11 +1873,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr ""
 
@@ -1891,11 +1891,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr ""
 
@@ -1903,26 +1903,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr ""
 
@@ -1930,19 +1930,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1950,19 +1950,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1970,8 +1970,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1987,14 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2002,38 +2002,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr ""
 
@@ -2043,22 +2043,22 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2067,77 +2067,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2147,84 +2147,84 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr ""
 
@@ -2233,66 +2233,72 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+msgid "Move to craft..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr ""
 
@@ -2303,56 +2309,56 @@ msgstr ""
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2360,30 +2366,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2391,7 +2397,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2400,134 +2406,135 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2535,64 +2542,71 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, c-format
+msgid "Move to craft %d"
+msgstr ""
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2605,13 +2619,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr ""
 
@@ -2619,15 +2633,21 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2636,7 +2656,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr ""
@@ -2647,7 +2667,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2658,7 +2678,7 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2936,14 +2956,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3031,7 +3051,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3119,13 +3139,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4108,37 +4128,37 @@ msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4147,8 +4167,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4490,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr ""
 
@@ -5550,7 +5570,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5594,7 +5614,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr ""
 
@@ -5606,7 +5626,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr ""
@@ -5619,7 +5639,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5636,7 +5656,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -5773,7 +5793,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
@@ -5879,99 +5899,100 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr ""
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6227,7 +6248,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6260,27 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6879,42 +6900,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7598,6 +7619,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, c-format
+msgid "Craft shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8593,7 +8624,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
+msgid "Client too old or wrong server type."
 msgstr ""
 
 #. TRANSLATORS: error message
@@ -8998,7 +9029,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr ""
 
@@ -9018,7 +9049,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9269,157 +9300,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9433,11 +9464,6 @@ msgstr ""
 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 d4bc02dfa..0966f0d2d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -38,7 +38,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -47,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,38 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -503,13 +503,13 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -559,7 +559,7 @@ msgstr "Wijzigen spelservers"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1725,24 +1725,24 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1774,7 +1774,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1789,8 +1789,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1802,41 +1802,41 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1853,10 +1853,10 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Beweeg"
 
@@ -1864,8 +1864,8 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1879,11 +1879,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,11 +1897,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1909,26 +1909,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1936,19 +1936,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1956,19 +1956,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1976,8 +1976,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1993,14 @@ msgstr "Afdoen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2008,38 +2008,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2049,22 +2049,22 @@ 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:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2073,77 +2073,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2153,84 +2153,84 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr ""
 
@@ -2239,66 +2239,73 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Beweeg tot aan Doel"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2309,56 +2316,56 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2366,30 +2373,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2397,7 +2404,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2406,134 +2413,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 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:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2541,64 +2549,71 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Beweeg tot aan Doel"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2611,13 +2626,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2625,15 +2640,21 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2642,7 +2663,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2653,7 +2674,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2664,7 +2685,7 @@ msgid "Other"
 msgstr "Andere"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2942,14 +2963,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3037,7 +3058,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -3125,13 +3146,13 @@ msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4114,37 +4135,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Standaard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4153,8 +4174,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4496,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Winkel"
 
@@ -5562,7 +5583,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5606,7 +5627,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5618,7 +5639,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5631,7 +5652,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5648,7 +5669,7 @@ msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -5785,7 +5806,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
@@ -5891,99 +5912,100 @@ msgstr ""
 msgid "Name:"
 msgstr "Naam:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Nog %d punten te verdelen"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Nog %d punten te verdelen"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6239,7 +6261,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6251,27 +6273,27 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6891,42 +6913,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7612,6 +7634,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Snelkoppeling naar voorwerp %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8609,8 +8641,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Client is te oud."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9016,7 +9048,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9036,7 +9068,7 @@ msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9287,157 +9319,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9451,11 +9483,6 @@ msgstr ""
 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."
@@ -10423,3 +10450,6 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Client too old."
+#~ msgstr "Client is te oud."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index d4bc02dfa..0966f0d2d 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -38,7 +38,7 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -47,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,38 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -503,13 +503,13 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -559,7 +559,7 @@ msgstr "Wijzigen spelservers"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1725,24 +1725,24 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1774,7 +1774,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1789,8 +1789,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1802,41 +1802,41 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1853,10 +1853,10 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Beweeg"
 
@@ -1864,8 +1864,8 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1879,11 +1879,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,11 +1897,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1909,26 +1909,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1936,19 +1936,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1956,19 +1956,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1976,8 +1976,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1993,14 @@ msgstr "Afdoen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2008,38 +2008,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2049,22 +2049,22 @@ 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:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2073,77 +2073,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2153,84 +2153,84 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr ""
 
@@ -2239,66 +2239,73 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Beweeg tot aan Doel"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2309,56 +2316,56 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2366,30 +2373,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2397,7 +2404,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2406,134 +2413,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 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:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2541,64 +2549,71 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Beweeg tot aan Doel"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2611,13 +2626,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Snelkoppeling"
 
@@ -2625,15 +2640,21 @@ msgstr "Snelkoppeling"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2642,7 +2663,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2653,7 +2674,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2664,7 +2685,7 @@ msgid "Other"
 msgstr "Andere"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2942,14 +2963,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3037,7 +3058,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -3125,13 +3146,13 @@ msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4114,37 +4135,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Toewijzen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Standaard"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4153,8 +4174,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4496,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Winkel"
 
@@ -5562,7 +5583,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5606,7 +5627,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5618,7 +5639,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5631,7 +5652,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5648,7 +5669,7 @@ msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -5785,7 +5806,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
@@ -5891,99 +5912,100 @@ msgstr ""
 msgid "Name:"
 msgstr "Naam:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Nog %d punten te verdelen"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Haarkleur:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Haarstijl:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Nog %d punten te verdelen"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Ras:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6239,7 +6261,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6251,27 +6273,27 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6891,42 +6913,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7612,6 +7634,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Snelkoppeling naar voorwerp %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8609,8 +8641,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Client is te oud."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9016,7 +9048,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9036,7 +9068,7 @@ msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9287,157 +9319,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9451,11 +9483,6 @@ msgstr ""
 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."
@@ -10423,3 +10450,6 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Client too old."
+#~ msgstr "Client is te oud."
diff --git a/po/pl.po b/po/pl.po
index 273e8b163..abf0c26e0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -42,7 +42,7 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -51,7 +51,7 @@ msgstr "Plik wysłano"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -73,38 +73,38 @@ msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "znajomy"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "lekceważony"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutralny"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "wróg"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -508,13 +508,13 @@ msgstr "Pomoc"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
@@ -564,7 +564,7 @@ msgstr "Zmiana serwera"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1731,24 +1731,24 @@ msgstr "Utwórz grupę"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1780,7 +1780,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1795,8 +1795,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1808,41 +1808,41 @@ msgstr "Atak"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
@@ -1859,10 +1859,10 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Podejdź"
 
@@ -1870,8 +1870,8 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -1885,11 +1885,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Kup"
 
@@ -1903,11 +1903,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1915,26 +1915,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1942,19 +1942,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1962,19 +1962,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1982,8 +1982,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1999,14 @@ msgstr "Zdejmij"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Zmień nazwę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2014,38 +2014,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Portal"
 
@@ -2055,22 +2055,22 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -2079,77 +2079,77 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Opuść"
 
@@ -2159,84 +2159,84 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nick:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -2245,66 +2245,73 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Podejdź do celu"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2315,56 +2322,56 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "W dół"
 
@@ -2372,30 +2379,30 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Pokaż okno"
 
@@ -2403,7 +2410,7 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2412,134 +2419,135 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2547,64 +2555,71 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Podejdź do celu"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2617,13 +2632,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Podstawowe"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Skróty"
 
@@ -2631,15 +2646,21 @@ msgstr "Skróty"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Okna"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emotki"
@@ -2648,7 +2669,7 @@ msgstr "Emotki"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Czat"
@@ -2659,7 +2680,7 @@ msgstr "Czat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2670,7 +2691,7 @@ msgid "Other"
 msgstr "Inne"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "GUI"
 
@@ -2948,14 +2969,14 @@ msgstr "Poziom: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Ekw."
 
@@ -3043,7 +3064,7 @@ msgstr "Edycja"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -3131,13 +3152,13 @@ msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -4122,37 +4143,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Przypisz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Odznacz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Domyślne"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Zresetuj wszystkie klawisze"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Wejście"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4163,8 +4184,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "nieznane"
 
@@ -4506,7 +4527,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Sklep"
 
@@ -5573,7 +5594,7 @@ msgstr "OM"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Misje"
 
@@ -5617,7 +5638,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -5629,7 +5650,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -5642,7 +5663,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Wózek"
@@ -5659,7 +5680,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -5796,7 +5817,7 @@ msgstr "Ilość:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Utwórz"
@@ -5902,99 +5923,100 @@ msgstr "Nowa postać"
 msgid "Name:"
 msgstr "Nazwa:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Proszę wykorzystać %d punktów"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Kolor włosów:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Fryzura:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Proszę wykorzystać %d punktów"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Rasa:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Wygląd:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -6255,7 +6277,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6267,27 +6289,27 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6909,42 +6931,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7630,6 +7652,16 @@ msgid "Show smiles"
 msgstr "Pokaż Emotki"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Skrót ubioru %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Klawisze modyfikatorów emotek"
@@ -8625,8 +8657,8 @@ msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów.
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Klient jest zbyt nieaktualny."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9032,7 +9064,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -9052,7 +9084,7 @@ msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9303,157 +9335,157 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Atak krytyczny %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Atak magią %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Obrona krytyczna %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Obrona magiczna %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "PŻ %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Poziom %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Prędkość poruszania %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Zasięg %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Ominięcie %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "zwierzątko"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9467,11 +9499,6 @@ msgstr "Magazyn"
 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."
@@ -10441,3 +10468,6 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
+
+#~ msgid "Client too old."
+#~ msgstr "Klient jest zbyt nieaktualny."
diff --git a/po/pt.po b/po/pt.po
index 13c3c83f9..be2f3615d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
@@ -38,7 +38,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -47,7 +47,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,38 +69,38 @@ msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 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:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "Inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -503,13 +503,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -559,7 +559,7 @@ msgstr "Mudando servidores do jogo"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1732,24 +1732,24 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1781,7 +1781,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1796,8 +1796,8 @@ msgstr "Negócios"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1809,41 +1809,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1860,10 +1860,10 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
 
@@ -1871,8 +1871,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Falar"
 
@@ -1886,11 +1886,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1904,11 +1904,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -1916,26 +1916,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1943,19 +1943,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1963,19 +1963,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1983,8 +1983,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2000,14 @@ msgstr "Desequipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2015,38 +2015,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2056,22 +2056,22 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -2080,77 +2080,77 @@ msgstr "Mover câmera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Sair"
 
@@ -2160,84 +2160,84 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 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:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -2246,66 +2246,73 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Mover para o alvo"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2316,56 +2323,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2373,30 +2380,30 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar janela"
 
@@ -2404,7 +2411,7 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2413,134 +2420,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 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:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2548,64 +2556,71 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Mover para o alvo"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2618,13 +2633,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2632,15 +2647,21 @@ msgstr "Atalhos"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emoções"
@@ -2649,7 +2670,7 @@ msgstr "Emoções"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2660,7 +2681,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2671,7 +2692,7 @@ msgid "Other"
 msgstr "Outro"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Gui"
 
@@ -2949,14 +2970,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3044,7 +3065,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3132,13 +3153,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline."
@@ -4121,37 +4142,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Padrão"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4162,8 +4183,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -4505,7 +4526,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Loja"
 
@@ -5569,7 +5590,7 @@ msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Missões"
 
@@ -5613,7 +5634,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5625,7 +5646,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
@@ -5638,7 +5659,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
@@ -5655,7 +5676,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -5792,7 +5813,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
@@ -5898,99 +5919,100 @@ msgstr "Novo Pesonagem"
 msgid "Name:"
 msgstr "Nome:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Por favor distribua %d pontos"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor distribua %d pontos"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6251,7 +6273,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6263,27 +6285,27 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6903,42 +6925,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7623,6 +7645,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Atalho de roupa: %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Teclas de modificadores de emoções"
@@ -8620,8 +8652,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Cliente muito antigo."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9027,7 +9059,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9047,7 +9079,7 @@ msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9298,157 +9330,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9462,11 +9494,6 @@ msgstr "Armazém"
 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."
@@ -10434,3 +10461,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Client too old."
+#~ msgstr "Cliente muito antigo."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8aeb97e1b..8052efe9a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
@@ -49,7 +49,7 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -58,7 +58,7 @@ msgstr "Arquivo enviado"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -80,38 +80,38 @@ msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pôde ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais sendo ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Jogador não mais apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Jogador não pôde ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr "Mensagem rápida"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr "Config value: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -516,13 +516,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -572,7 +572,7 @@ msgstr "Mudando de servidor do jogo"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1744,24 +1744,24 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1793,7 +1793,7 @@ msgstr "Cartões: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1808,8 +1808,8 @@ msgstr "Negociação"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1821,41 +1821,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1872,10 +1872,10 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
 
@@ -1883,8 +1883,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Falar"
 
@@ -1898,11 +1898,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1916,11 +1916,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Vender"
 
@@ -1928,26 +1928,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1955,19 +1955,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Mover para o mestre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Dispensar"
 
@@ -1975,19 +1975,19 @@ msgstr "Dispensar"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Alimentar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Descartar saque"
 
@@ -1995,8 +1995,8 @@ msgstr "Descartar saque"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2012,14 @@ msgstr "Desequipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Retornar ao ovo"
 
@@ -2027,38 +2027,38 @@ msgstr "Retornar ao ovo"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2068,22 +2068,22 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -2092,77 +2092,77 @@ msgstr "Mover câmera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Sair"
 
@@ -2172,84 +2172,84 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 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:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Adicionar todos na negociação"
 
@@ -2258,66 +2258,73 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Mover para o mestre"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2328,56 +2335,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2385,30 +2392,30 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar Janela"
 
@@ -2416,7 +2423,7 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2425,134 +2432,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 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:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2560,64 +2568,71 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Mover para o mestre"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2630,13 +2645,13 @@ msgid "Level: Unknown"
 msgstr "Level: Desconhecido"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Básico"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Atalhos"
 
@@ -2644,15 +2659,21 @@ msgstr "Atalhos"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Janelas"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emoticons"
@@ -2661,7 +2682,7 @@ msgstr "Emoticons"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2672,7 +2693,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2683,7 +2704,7 @@ msgid "Other"
 msgstr "Outro"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Gui"
 
@@ -2961,14 +2982,14 @@ msgstr "Nível: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3056,7 +3077,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3144,13 +3165,13 @@ msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline."
@@ -4263,37 +4284,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Atribuir"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Padrão"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Entrada"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4304,8 +4325,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -4647,7 +4668,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Loja"
 
@@ -5715,7 +5736,7 @@ msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Missões"
 
@@ -5759,7 +5780,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5771,7 +5792,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventário"
@@ -5784,7 +5805,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Carrinho"
@@ -5801,7 +5822,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -5938,7 +5959,7 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
@@ -6044,99 +6065,100 @@ msgstr "Novo Personagem"
 msgid "Name:"
 msgstr "Nome:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Por favor distribua %d pontos"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Cor do Cabelo:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Estilo do Cabelo:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor distribua %d pontos"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Corrida:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Aparência:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr "M"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6397,7 +6419,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6409,27 +6431,27 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr "Insira o cartão requisitado"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "insira %s em %s?"
@@ -7049,42 +7071,42 @@ msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Adicione um texto a habilidade %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7769,6 +7791,16 @@ msgid "Show smiles"
 msgstr "Mostrar carinhas"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Atalho de Roupa %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Teclas modificadoras de emoticons"
@@ -8767,8 +8799,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Cliente muito antigo."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9174,7 +9206,7 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9194,7 +9226,7 @@ msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Você tem um novo E-mail de %s assunto %s"
@@ -9445,157 +9477,157 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr "Ataque mínimo %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr "Ataque máximo %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr "Defesa mínima %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr "Defesa máxima %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defesa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Defesa M. Mínima %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Defesa M. Máxima %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr "HP máximo %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr "MP máximo %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Nível %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidade %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Evasão %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr "Escape mínimo %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr "Escape Máximo %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr "Espaços para cartões %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "animal de estimação"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Habilidade"
 
@@ -9609,11 +9641,6 @@ msgstr "Armazém"
 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."
@@ -10587,3 +10614,6 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
+
+#~ msgid "Client too old."
+#~ msgstr "Cliente muito antigo."
diff --git a/po/ru.po b/po/ru.po
index ba0ccf5b4..cf93a3712 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 11:25+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
@@ -48,7 +48,7 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -57,7 +57,7 @@ msgstr "Файл выгружен"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -79,38 +79,38 @@ msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
@@ -171,91 +171,91 @@ msgid "equipped hat %s."
 msgstr "Одета шапка: %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Игрок больше не удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "друг"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "нейтральный"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "враг"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr "Быстрое сообщение"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr "Значение настройки: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -515,13 +515,13 @@ msgstr "Помощь"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
@@ -571,7 +571,7 @@ msgstr "Смена игрового сервера"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1741,24 +1741,24 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1790,7 +1790,7 @@ msgstr "Карты: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1805,8 +1805,8 @@ msgstr "Торговать"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1818,41 +1818,41 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1869,10 +1869,10 @@ msgstr "Уничтожить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Движение"
 
@@ -1880,8 +1880,8 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Разговор"
 
@@ -1895,11 +1895,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Купить"
 
@@ -1913,11 +1913,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Продать"
 
@@ -1925,26 +1925,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1952,19 +1952,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Перейти к владельцу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Уволить"
 
@@ -1972,19 +1972,19 @@ msgstr "Уволить"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Накормить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Убить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Бросить лут"
 
@@ -1992,8 +1992,8 @@ msgstr "Бросить лут"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +2009,14 @@ msgstr "Снять"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Переименовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Вернут в яйцо"
 
@@ -2024,38 +2024,38 @@ msgstr "Вернут в яйцо"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Элемент карты"
 
@@ -2065,22 +2065,22 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -2089,77 +2089,77 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -2169,84 +2169,84 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Имя:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -2255,66 +2255,73 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Перейти к владельцу"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2325,56 +2332,56 @@ msgstr "Получить все"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2382,30 +2389,30 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Показать окно"
 
@@ -2413,7 +2420,7 @@ msgstr "Показать окно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2422,134 +2429,135 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2557,64 +2565,71 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Перейти к владельцу"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2627,13 +2642,13 @@ msgid "Level: Unknown"
 msgstr "Уровень: Неизвестно"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Основное"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Горячие клавиши"
 
@@ -2641,15 +2656,21 @@ msgstr "Горячие клавиши"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Окна"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr "Крафт"
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Смайлы"
@@ -2658,7 +2679,7 @@ msgstr "Смайлы"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Чат"
@@ -2669,7 +2690,7 @@ msgstr "Чат"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2680,7 +2701,7 @@ msgid "Other"
 msgstr "Другое"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Интерфейс"
 
@@ -2958,14 +2979,14 @@ msgstr "Уровень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Од."
 
@@ -3053,7 +3074,7 @@ msgstr "Изменить"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -3141,13 +3162,13 @@ msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -4133,37 +4154,37 @@ msgid "Alpha:"
 msgstr "Прозрачность:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Назначить"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Снять назначение"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "По умолчанию"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Сбросить все кнопки"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Ввод"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4174,8 +4195,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -4517,7 +4538,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Магазин"
 
@@ -5590,7 +5611,7 @@ msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Квесты"
 
@@ -5634,7 +5655,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -5646,7 +5667,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -5659,7 +5680,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Телега"
@@ -5676,7 +5697,7 @@ msgstr "УМ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Навыки"
 
@@ -5813,7 +5834,7 @@ msgstr "Количество:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Создать"
@@ -5919,99 +5940,100 @@ msgstr "Новый персонаж"
 msgid "Name:"
 msgstr "Имя:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Распределите очки (%d)"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Цвет волос:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Стрижка:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Распределите очки (%d)"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "Д"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr "М"
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr "Н"
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr "?"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -6272,7 +6294,7 @@ msgstr "Вставка"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6284,27 +6306,27 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr "П"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr "М"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
@@ -6928,42 +6950,42 @@ msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr "Текст: "
 
@@ -7649,6 +7671,16 @@ msgid "Show smiles"
 msgstr "Показать смайлы"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Комбинация клавиш наряда %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Модификаторы смайлов"
@@ -8646,8 +8678,8 @@ msgstr "Вас навсегда забанили. Пожалуйста, свяж
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Клиент устарел."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9052,7 +9084,7 @@ msgstr "Осталось %s арендного времени для %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -9072,7 +9104,7 @@ msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Вам пришло сообщение от %s и заголовком %s"
@@ -9323,157 +9355,157 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr "Мин. атака %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr "Макс. атака %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критическая атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr "Мин. защита %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr "Макс. защита %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Защита от критической атаки %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Мин. магическая защита %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Макс. магическая защита %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "Жизнь %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr "Макс. здоровье %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr "Макс. мана %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Уровень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Скорость %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Расстояние %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Уклонение %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr "Мин. уклонение %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr "Макс. уклонение %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr "Слоты %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "животное"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr "Скил"
 
@@ -9487,11 +9519,6 @@ msgstr "Хранилище"
 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."
@@ -10463,3 +10490,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Client too old."
+#~ msgstr "Клиент устарел."
diff --git a/po/sr.po b/po/sr.po
index 0e484fce8..072226e7e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -37,7 +37,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -46,7 +46,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -68,38 +68,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Igrač je već %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Igrač je uspešno %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Igrač nije mogao biti %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Igrač nije ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Igrač nije više ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Igrač nije mogao da se de-ignoriše!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Igrač je već obrisan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Igrač se nije mogao obrisati!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "prijatelj"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "zanemaren"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutralan"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr ""
 
@@ -503,13 +503,13 @@ msgstr "Pomoć"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
@@ -559,7 +559,7 @@ msgstr "Menjam server igre"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1723,24 +1723,24 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr ""
 
@@ -1851,10 +1851,10 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr ""
 
@@ -1862,8 +1862,8 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr ""
 
@@ -1877,11 +1877,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr ""
 
@@ -1895,11 +1895,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr ""
 
@@ -1907,26 +1907,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr ""
 
@@ -1934,19 +1934,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,8 +1974,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1991,14 @@ msgstr "Skini"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr ""
 
@@ -2047,22 +2047,22 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2071,77 +2071,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2151,84 +2151,84 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Ime:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr ""
 
@@ -2237,66 +2237,72 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Sačuvaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Sačuvaj pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Sačuvaj sve"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+msgid "Move to craft..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Uzmi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Uzmi pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Uzmi sve"
 
@@ -2307,56 +2313,56 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2364,30 +2370,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2395,7 +2401,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2404,134 +2410,135 @@ msgstr "Nivo: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2539,64 +2546,71 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, c-format
+msgid "Move to craft %d"
+msgstr ""
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2609,13 +2623,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr ""
 
@@ -2623,15 +2637,21 @@ msgstr ""
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2640,7 +2660,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Ćaskanje"
@@ -2651,7 +2671,7 @@ msgstr "Ćaskanje"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2662,7 +2682,7 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2940,14 +2960,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3035,7 +3055,7 @@ msgstr "Izmeni"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3123,13 +3143,13 @@ msgid "%s whispers: %s"
 msgstr "%s šapuće: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4112,37 +4132,37 @@ msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4153,8 +4173,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4496,7 +4516,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr ""
 
@@ -5556,7 +5576,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5600,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Oprema"
 
@@ -5612,7 +5632,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Lista predmeta"
@@ -5625,7 +5645,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5642,7 +5662,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr ""
 
@@ -5779,7 +5799,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
@@ -5885,99 +5905,100 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr ""
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6233,7 +6254,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6266,27 @@ msgid "Equip"
 msgstr "Obuci"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6887,42 +6908,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7606,6 +7627,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Prečica emocije: %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8601,7 +8632,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
+msgid "Client too old or wrong server type."
 msgstr ""
 
 #. TRANSLATORS: error message
@@ -9006,7 +9037,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr ""
 
@@ -9026,7 +9057,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9277,157 +9308,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9441,11 +9472,6 @@ msgstr ""
 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 c88bad9d1..edbcafe7c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -35,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -44,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -66,38 +66,38 @@ msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -500,13 +500,13 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -556,7 +556,7 @@ msgstr "Ändrar spelserver"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1723,24 +1723,24 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr "Trade"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1851,10 +1851,10 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Flytta"
 
@@ -1862,8 +1862,8 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1877,11 +1877,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,11 +1895,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1907,26 +1907,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1934,19 +1934,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,8 +1974,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1991,14 @@ msgstr "Unequip"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2047,22 +2047,22 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -2071,77 +2071,77 @@ msgstr "Rör kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2151,84 +2151,84 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2237,66 +2237,73 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Flytta till Target"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 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:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2307,56 +2314,56 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2364,30 +2371,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2395,7 +2402,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2404,134 +2411,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2539,64 +2547,71 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Flytta till Target"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2609,13 +2624,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2623,15 +2638,21 @@ msgstr "Genvägar"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emotes"
@@ -2640,7 +2661,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2651,7 +2672,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2662,7 +2683,7 @@ msgid "Other"
 msgstr "Annat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Gui"
 
@@ -2940,14 +2961,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3035,7 +3056,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3123,13 +3144,13 @@ msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -4112,37 +4133,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Default"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Putta in"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Tangent-konflikt(er) uppmärksammade."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4153,8 +4174,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "okänd"
 
@@ -4496,7 +4517,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Shop"
 
@@ -5561,7 +5582,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Uppdrag"
 
@@ -5605,7 +5626,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5617,7 +5638,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
@@ -5630,7 +5651,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
@@ -5647,7 +5668,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Skills"
 
@@ -5784,7 +5805,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
@@ -5890,99 +5911,100 @@ msgstr "Ny karaktär"
 msgid "Name:"
 msgstr "Namn:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Vänligen distribuera %d poäng"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Hårstil:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Vänligen distribuera %d poäng"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6245,7 +6267,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6257,27 +6279,27 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6897,42 +6919,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7618,6 +7640,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Klädsel-genväg %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Emote-modifierande knappar"
@@ -8616,8 +8648,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Klienten är uråldrig."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9023,7 +9055,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9043,7 +9075,7 @@ msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9294,157 +9326,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9458,11 +9490,6 @@ msgstr "Storage"
 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."
@@ -10430,3 +10457,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Client too old."
+#~ msgstr "Klienten är uråldrig."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c88bad9d1..edbcafe7c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -35,7 +35,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -44,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -66,38 +66,38 @@ msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -500,13 +500,13 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -556,7 +556,7 @@ msgstr "Ändrar spelserver"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1723,24 +1723,24 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr "Trade"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1851,10 +1851,10 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Flytta"
 
@@ -1862,8 +1862,8 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1877,11 +1877,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,11 +1895,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1907,26 +1907,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1934,19 +1934,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,8 +1974,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1991,14 @@ msgstr "Unequip"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2047,22 +2047,22 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -2071,77 +2071,77 @@ msgstr "Rör kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2151,84 +2151,84 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 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:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2237,66 +2237,73 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Flytta till Target"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 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:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2307,56 +2314,56 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 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:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2364,30 +2371,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2395,7 +2402,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2404,134 +2411,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 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:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2539,64 +2547,71 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Flytta till Target"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2609,13 +2624,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Enkel"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Genvägar"
 
@@ -2623,15 +2638,21 @@ msgstr "Genvägar"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Fönster"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Emotes"
@@ -2640,7 +2661,7 @@ msgstr "Emotes"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Chat"
@@ -2651,7 +2672,7 @@ msgstr "Chat"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2662,7 +2683,7 @@ msgid "Other"
 msgstr "Annat"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "Gui"
 
@@ -2940,14 +2961,14 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Eq."
 
@@ -3035,7 +3056,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3123,13 +3144,13 @@ msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -4112,37 +4133,37 @@ msgid "Alpha:"
 msgstr "Alpha:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Tilldela"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Default"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Putta in"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Tangent-konflikt(er) uppmärksammade."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4153,8 +4174,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "okänd"
 
@@ -4496,7 +4517,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Shop"
 
@@ -5561,7 +5582,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Uppdrag"
 
@@ -5605,7 +5626,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5617,7 +5638,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Inventory"
@@ -5630,7 +5651,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Cart"
@@ -5647,7 +5668,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Skills"
 
@@ -5784,7 +5805,7 @@ msgstr "Antal:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
@@ -5890,99 +5911,100 @@ msgstr "Ny karaktär"
 msgid "Name:"
 msgstr "Namn:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Vänligen distribuera %d poäng"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Hårfärg:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Hårstil:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Vänligen distribuera %d poäng"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6245,7 +6267,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6257,27 +6279,27 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6897,42 +6919,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7618,6 +7640,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Klädsel-genväg %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Emote-modifierande knappar"
@@ -8616,8 +8648,8 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Klienten är uråldrig."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9023,7 +9055,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9043,7 +9075,7 @@ msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9294,157 +9326,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9458,11 +9490,6 @@ msgstr "Storage"
 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."
@@ -10430,3 +10457,6 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Client too old."
+#~ msgstr "Klienten är uråldrig."
diff --git a/po/tr.po b/po/tr.po
index b9f96d5a0..e0d90b925 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -37,7 +37,7 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -46,7 +46,7 @@ msgstr "Dosya yüklendi"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -68,38 +68,38 @@ msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 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:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Oyuncu zaten %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Oyuncu başarı ile %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Oyuncu %s yapılamadı!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Oyuncu görmezden gelinmiyordu!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Oyuncu daha fazla görmezden gelinmiyor!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Oyuncuyu görmezden gelme geri alınamadı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Oyuncu zaten silindi!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Oyuncu geri alındı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Oyuncu silinemedi!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "arkadaş"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "ihmal edilmiş"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "nötr"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "kara listeye alınmış"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "düşman"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -502,13 +502,13 @@ msgstr "Yardım"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
@@ -558,7 +558,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1726,24 +1726,24 @@ msgstr "Parti kur"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "Takas"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "Saldırı"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Fısıltı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "İyileş"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Guild'den at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Guild'deki pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Guild'e davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1854,10 +1854,10 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Taşı"
 
@@ -1865,8 +1865,8 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Konuş"
 
@@ -1880,11 +1880,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1898,11 +1898,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Sat"
 
@@ -1910,26 +1910,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Yorum ekle"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Saldırı listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Öncelikli saldırı listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Saldırı listesine ekle"
 
@@ -1937,19 +1937,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Sahibe git"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Kov"
 
@@ -1957,19 +1957,19 @@ msgstr "Kov"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Besle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Öldür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Ganimet bırak"
 
@@ -1977,8 +1977,8 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1994,14 @@ msgstr "Çıkar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Yumurtaya dön"
 
@@ -2009,38 +2009,38 @@ msgstr "Yumurtaya dön"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Sohbete isim ekle"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Partiden at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Harita itemi"
 
@@ -2050,22 +2050,22 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Dönüştür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Hareket kamerası"
 
@@ -2074,77 +2074,77 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 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:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "İsimleri kaldırma"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "AFK aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -2154,84 +2154,84 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Guild pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "pencere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Kilidi aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Kilitle"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 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:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "İsim:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Oyuncu yorumu             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Yorum:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 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:1695
+#: src/gui/popups/popupmenu.cpp:1602
 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:1699
+#: src/gui/popups/popupmenu.cpp:1606
 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:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -2240,66 +2240,73 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 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:1728
+#: src/gui/popups/popupmenu.cpp:1635
 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:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Sahibe git"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 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:1759
+#: src/gui/popups/popupmenu.cpp:1680
 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:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2310,56 +2317,56 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2367,30 +2374,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2398,7 +2405,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2407,134 +2414,135 @@ msgstr "Seviye: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 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:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2542,64 +2550,71 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Sahibe git"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2612,13 +2627,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Kısayollar"
 
@@ -2626,15 +2641,21 @@ msgstr "Kısayollar"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2643,7 +2664,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Sohbet"
@@ -2654,7 +2675,7 @@ msgstr "Sohbet"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2665,7 +2686,7 @@ msgid "Other"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2943,14 +2964,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3038,7 +3059,7 @@ msgstr "Dünzenle"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -3126,13 +3147,13 @@ msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4116,37 +4137,37 @@ msgid "Alpha:"
 msgstr "Alfa:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Atamak"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Sil"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "Varsayılan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Tuş çatışması tespit edildi."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4157,8 +4178,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4500,7 +4521,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -5560,7 +5581,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5604,7 +5625,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -5616,7 +5637,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Envanter"
@@ -5629,7 +5650,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5646,7 +5667,7 @@ msgstr "YTN"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Yetenekler"
 
@@ -5783,7 +5804,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Oluştur"
@@ -5889,99 +5910,100 @@ msgstr ""
 msgid "Name:"
 msgstr "İsim:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Lütfen %d puanı dağıt"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Saç Rengi:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Saç Stili:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Lütfen %d puanı dağıt"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -6237,7 +6259,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6271,27 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6889,42 +6911,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7610,6 +7632,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Nesne Kısayolu %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8605,7 +8637,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
+msgid "Client too old or wrong server type."
 msgstr ""
 
 #. TRANSLATORS: error message
@@ -9010,7 +9042,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -9030,7 +9062,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9281,157 +9313,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9445,11 +9477,6 @@ msgstr ""
 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 231fe1a42..24f70c6ca 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -38,7 +38,7 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -47,7 +47,7 @@ msgstr "Файл завантажено"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,38 +69,38 @@ msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "Будь ласка, вкажіть гравця."
 
@@ -163,91 +163,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "Гравця все позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Гравця позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Неможливо позначити гравця як \"%s\"!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "Гравець не ігнорувався!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "Гравець більше не ігнорується!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "Не можна видалити цього гравця зі списку ігнорованих!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "Гравець все стертий!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "Гравця повернуто із порожнечі!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "Не можна повернути цього стертого гравця!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "приятель"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "зневажити"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "нейтральний"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "чорний список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "супротивник"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -506,13 +506,13 @@ msgstr "Довідка"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрити"
 
@@ -562,7 +562,7 @@ msgstr "Зміна ігрового серверу..."
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1730,24 +1730,24 @@ msgstr "Створити групу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1779,7 +1779,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1794,8 +1794,8 @@ msgstr "Торгівля"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1807,41 +1807,41 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "Шепіт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "Вилікувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "Виштовхати з гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "Запросити до гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "Знищити"
 
@@ -1858,10 +1858,10 @@ msgstr "Знищити"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Рух"
 
@@ -1869,8 +1869,8 @@ msgstr "Рух"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "Діалог"
 
@@ -1884,11 +1884,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "Придбати"
 
@@ -1902,11 +1902,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "Продати"
 
@@ -1914,26 +1914,26 @@ msgstr "Продати"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Додати примітку"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "Видалити зі списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "Додати до пріоритетного списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "Додати до списку атаки"
 
@@ -1941,19 +1941,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "Наблизити до власника"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "Атакувати"
 
@@ -1961,19 +1961,19 @@ msgstr "Атакувати"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "Нагодувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "Вбити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "Скинути дропи"
 
@@ -1981,8 +1981,8 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1998,14 @@ msgstr "Зняти"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Перейменувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "Повернути до яйця"
 
@@ -2013,38 +2013,38 @@ msgstr "Повернути до яйця"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "Додати ім'я до чату"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "Елемент карти"
 
@@ -2054,22 +2054,22 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Видалити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Телепорт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "Рухати камеру"
 
@@ -2078,77 +2078,77 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "Швидке спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "Редагувати заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Скинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "Вимкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "Увімкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "Не приховувати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "Приховати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "Дозволити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "Заборонити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Залишити"
 
@@ -2158,84 +2158,84 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "вікно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "Відімкнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "Зафіксувати"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "Перейменувати            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "Ім'я:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "Примітка до гравця        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "Примітка:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "Додати до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr "Додати до торгівлі 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr "Додати половину до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr "Додати все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "Додати всю кількість"
 
@@ -2244,66 +2244,73 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "Зберегти 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "Зберегти половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "Зберегти все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "Зберегти всю кількість"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "Наблизити до власника"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Вилучити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "Вилучити 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "Вилучити половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "Вилучити все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "Вилучити всю кількість"
 
@@ -2314,56 +2321,56 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2371,30 +2378,30 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Показати вікно"
 
@@ -2402,7 +2409,7 @@ msgstr "Показати вікно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2411,134 +2418,135 @@ msgstr "Рівень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2546,64 +2554,71 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "Наблизити до власника"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2616,13 +2631,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "Загальне"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "Швидкі клавіші"
 
@@ -2630,15 +2645,21 @@ msgstr "Швидкі клавіші"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "Вікна"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "Смайлики"
@@ -2647,7 +2668,7 @@ msgstr "Смайлики"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "Чат"
@@ -2658,7 +2679,7 @@ msgstr "Чат"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2669,7 +2690,7 @@ msgid "Other"
 msgstr "Інше"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "GUI"
 
@@ -2947,14 +2968,14 @@ msgstr "Рівень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr "Вдяг."
 
@@ -3042,7 +3063,7 @@ msgstr "Редагувати"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
@@ -3130,13 +3151,13 @@ msgid "%s whispers: %s"
 msgstr "%s шепоче: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr "%s з'явився онлайн."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вийшов з гри."
@@ -4119,37 +4140,37 @@ msgid "Alpha:"
 msgstr "Прозорість:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "Призначити"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "Відмінити"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "За замовчуванням"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Скинути всі клавіші"
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr "Введення"
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "Деякі клавіші дублюють одна одну."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4160,8 +4181,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr "невідоме"
 
@@ -4503,7 +4524,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "Крамниця"
 
@@ -5568,7 +5589,7 @@ msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr "Квести"
 
@@ -5612,7 +5633,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "Спорядження"
 
@@ -5624,7 +5645,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "Сумка"
@@ -5637,7 +5658,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr "Візок"
@@ -5654,7 +5675,7 @@ msgstr "ВМІ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "Вміння"
 
@@ -5791,7 +5812,7 @@ msgstr "Кількість:"
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Створити"
@@ -5897,99 +5918,100 @@ msgstr "Новий персонаж"
 msgid "Name:"
 msgstr "Ім'я:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr "^"
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Будь ласка, розподіліть %d балів"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "Колір волосся:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "Зачіска:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr "^"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Будь ласка, розподіліть %d балів"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr "Раса:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "П"
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ім'я повинно містити принаймні 4 символи."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "Характеристики персонажа в нормі"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "Будь ласка, видаліть %d балів"
@@ -6250,7 +6272,7 @@ msgstr "Вставити"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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,27 +6284,27 @@ msgid "Equip"
 msgstr "Вдягнути"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6904,42 +6926,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "Вище"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Балів вмінь: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr "Група вмінь %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "Вміння %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7623,6 +7645,16 @@ msgid "Show smiles"
 msgstr "Показувати смайлики (режим балачки)"
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "Клавіша спорядження %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr "Клавіші модифікаторів смайликів"
@@ -8618,8 +8650,8 @@ msgstr "Вас було навіки забанено. Пишіть листи �
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "Клієнт застарий."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9025,7 +9057,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "Невідомий предмет"
 
@@ -9045,7 +9077,7 @@ msgid "New password too short."
 msgstr "Новий пароль замалий."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9296,157 +9328,157 @@ msgstr "Новітній OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "казна що"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критична атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr "Магічна атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr "Захист %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr "Критичний захист %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr "Магічний захист %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr "Здоров'я %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr "Рівень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr "Швидкість %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr "Відстань %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr "Ухилення %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr "улюбленець"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9460,11 +9492,6 @@ msgstr "Сховище"
 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."
@@ -10432,3 +10459,6 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Client too old."
+#~ msgstr "Клієнт застарий."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e4c679a0..0f402e69d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -42,7 +42,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -51,7 +51,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -73,38 +73,38 @@ msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -506,13 +506,13 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -562,7 +562,7 @@ msgstr "正在更改游戏服务器"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1726,24 +1726,24 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "攻击"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr ""
 
@@ -1854,10 +1854,10 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "移动"
 
@@ -1865,8 +1865,8 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "说话"
 
@@ -1880,11 +1880,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "购买"
 
@@ -1898,11 +1898,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "出售"
 
@@ -1910,26 +1910,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1937,19 +1937,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr ""
 
@@ -1957,19 +1957,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr ""
 
@@ -1977,8 +1977,8 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1994,14 @@ msgstr "卸下装备"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr ""
 
@@ -2009,38 +2009,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2050,22 +2050,22 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr ""
 
@@ -2074,77 +2074,77 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2154,84 +2154,84 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "名称：                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr ""
 
@@ -2240,66 +2240,73 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "移动到目标"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2310,56 +2317,56 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2367,30 +2374,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2398,7 +2405,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2407,134 +2414,135 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "所有"
 
@@ -2542,64 +2550,71 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "移动到目标"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2612,13 +2627,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "快捷键"
 
@@ -2626,15 +2641,21 @@ msgstr "快捷键"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr ""
@@ -2643,7 +2664,7 @@ msgstr ""
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "聊天"
@@ -2654,7 +2675,7 @@ msgstr "聊天"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2665,7 +2686,7 @@ msgid "Other"
 msgstr "其他"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr ""
 
@@ -2943,14 +2964,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3038,7 +3059,7 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -3126,13 +3147,13 @@ msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4115,37 +4136,37 @@ msgid "Alpha:"
 msgstr "阿尔法:"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr "取消分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "预设"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4154,8 +4175,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4497,7 +4518,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "商店"
 
@@ -5557,7 +5578,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5601,7 +5622,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "装备"
 
@@ -5613,7 +5634,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "物品栏"
@@ -5626,7 +5647,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5643,7 +5664,7 @@ msgstr "技能"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "技能"
 
@@ -5780,7 +5801,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
@@ -5886,99 +5907,100 @@ msgstr ""
 msgid "Name:"
 msgstr "姓名:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "请分发%d点数"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr "头发颜色:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr "发型:"
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "请分发%d点数"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -6234,7 +6256,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6246,27 +6268,27 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6884,42 +6906,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7603,6 +7625,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "物品快捷 %d"
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8598,8 +8630,8 @@ msgstr "您已被永久禁止进入游戏。请联系GM团队."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "客户端太旧."
+msgid "Client too old or wrong server type."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9005,7 +9037,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -9025,7 +9057,7 @@ msgid "New password too short."
 msgstr "新密码太短."
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9276,157 +9308,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9440,11 +9472,6 @@ msgstr "仓库"
 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."
@@ -10410,3 +10437,6 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Client too old."
+#~ msgstr "客户端太旧."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 15cbb94a2..7c6f43ad2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
 "PO-Revision-Date: 2016-01-17 09:15+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -36,7 +36,7 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -45,7 +45,7 @@ msgstr "檔案上載成功"
 #: src/gui/widgets/tabs/setup_video.cpp:416
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
 #: src/gui/windows/charselectdialog.cpp:260
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -67,38 +67,38 @@ msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
 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:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已經 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能被 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
 msgid "Player wasn't ignored!"
 msgstr "玩家沒有被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
 msgid "Player already erased!"
 msgstr "玩家已經擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
 msgid "Player no longer erased!"
 msgstr "玩家不再被擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
 msgid "Player could not be erased!"
 msgstr "玩家不能被擦去!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
 msgid "disregarded"
 msgstr "被忽略"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
 msgid "blacklisted"
 msgstr "被列入黑名單"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
 msgid "enemy"
 msgstr "冤家"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
 #, c-format
 msgid "Config value: %s"
 msgstr "配置數值:%s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
 #, 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:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -500,13 +500,13 @@ msgstr "說明"
 #. TRANSLATORS: shop window button
 #: 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:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -556,7 +556,7 @@ msgstr "正在轉換遊戲伺服器"
 #: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
 #: src/gui/windows/charselectdialog.cpp:304
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:256
@@ -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:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 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:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1720,24 +1720,24 @@ msgstr "選擇隊伍"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 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/charcreatedialog.cpp:112
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
 #: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1769,7 +1769,7 @@ msgstr "卡片： "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1784,8 +1784,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1797,41 +1797,41 @@ msgstr "攻擊"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
 msgid "Whisper"
 msgstr "悄悄話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
 msgid "Heal"
 msgstr "療癒"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
 msgid "Kick from guild"
 msgstr "從公會踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
 msgid "Change pos in guild"
 msgstr "更改公會職位"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
 msgid "Invite to guild"
 msgstr "邀請至公會"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
 msgid "Nuke"
 msgstr "清除"
 
@@ -1848,10 +1848,10 @@ msgstr "清除"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "移動"
 
@@ -1859,8 +1859,8 @@ msgstr "移動"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
 msgid "Talk"
 msgstr "對話"
 
@@ -1874,11 +1874,11 @@ 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:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
 #: 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:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
 msgid "Buy"
 msgstr "購買"
 
@@ -1892,11 +1892,11 @@ 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:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
 #: 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:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
 msgid "Sell"
 msgstr "出售"
 
@@ -1904,26 +1904,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. 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:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "添加評論"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
 msgid "Remove from attack list"
 msgstr "從攻擊清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
 msgid "Add to priority attack list"
 msgstr "加至優先攻擊清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
 msgid "Add to attack list"
 msgstr "加至攻擊列表"
 
@@ -1931,19 +1931,19 @@ 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:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
 msgid "Move to master"
 msgstr "移動至主人"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
 msgid "Fire"
 msgstr "開火"
 
@@ -1951,19 +1951,19 @@ msgstr "開火"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
 msgid "Feed"
 msgstr "餵食"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
 msgid "Kill"
 msgstr "殺死"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
 msgid "Drop loot"
 msgstr "丟棄"
 
@@ -1971,8 +1971,8 @@ msgstr "丟棄"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 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,14 +1988,14 @@ msgstr "卸下裝備"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重新命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
 msgid "Return to egg"
 msgstr "返回蛋裏"
 
@@ -2003,38 +2003,38 @@ msgstr "返回蛋裏"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
 msgid "Add name to chat"
 msgstr "把名字加至對話"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
 msgid "Pick up"
 msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "加至對話"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
 msgid "Map Item"
 msgstr "地圖物件"
 
@@ -2044,22 +2044,22 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "傳送"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
 msgid "Move camera"
 msgstr "移動鏡頭"
 
@@ -2068,77 +2068,77 @@ msgstr "移動鏡頭"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
 msgid "Clear outfit"
 msgstr "清除裝備"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
 msgid "Edit spell"
 msgstr "編輯咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
 msgid "Disable highlight"
 msgstr "關閉高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
 msgid "Enable highlight"
 msgstr "開啟高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
 msgid "Don't remove name"
 msgstr "不要清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
 msgid "Remove name"
 msgstr "清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
 msgid "Enable away"
 msgstr "開啟暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
 msgid "Disable away"
 msgstr "關閉暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "離開"
 
@@ -2148,84 +2148,84 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
 msgid "Change guild position"
 msgstr "改變公會職位"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
 msgid "window"
 msgstr "視窗"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
 msgid "Unlock"
 msgstr "解鎖"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
 msgid "Lock"
 msgstr "鎖定"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
 msgid "Name:                    "
 msgstr "名字:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
 msgid "Add to trade"
 msgstr "加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2234,66 +2234,73 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 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:1719
+#: src/gui/popups/popupmenu.cpp:1626
 msgid "Store 10"
 msgstr "儲存 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
 msgid "Store half"
 msgstr "儲存 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "移動至主人"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
 msgid "Retrieve 10"
 msgstr "取回 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
 msgid "Retrieve half"
 msgstr "取回 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2304,56 +2311,56 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: 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/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 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:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2361,30 +2368,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2392,7 +2399,7 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 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
@@ -2401,134 +2408,135 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2536,64 +2544,71 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "移動至主人"
+
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
@@ -2606,13 +2621,13 @@ msgid "Level: Unknown"
 msgstr ""
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
 msgid "Basic"
 msgstr "基本"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
 msgid "Shortcuts"
 msgstr "捷徑"
 
@@ -2620,15 +2635,21 @@ msgstr "捷徑"
 #. TRANSLATORS: settings group
 #. TRANSLATORS: long button name for windows list menu.
 #. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
 #: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
 msgid "Windows"
 msgstr "視窗"
 
 #. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
 #. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
 #: src/gui/windows/emotewindow.cpp:114
 msgid "Emotes"
 msgstr "表情"
@@ -2637,7 +2658,7 @@ msgstr "表情"
 #. TRANSLATORS: settings tab name
 #. TRANSLATORS: longt button name for chat window.
 #. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
 #: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
 msgid "Chat"
 msgstr "聊天"
@@ -2648,7 +2669,7 @@ msgstr "聊天"
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: input action group
 #. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
 #: src/gui/widgets/tabs/setup_chat.cpp:290
 #: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2659,7 +2680,7 @@ msgid "Other"
 msgstr "其他"
 
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
 msgid "Gui"
 msgstr "介面"
 
@@ -2937,14 +2958,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 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:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
 msgid "Eq."
 msgstr ""
 
@@ -3032,7 +3053,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3120,13 +3141,13 @@ msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4109,37 +4130,37 @@ msgid "Alpha:"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
 msgid "Assign"
 msgstr "分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
 msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
 msgid "Default"
 msgstr "預設"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
 
 #. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
 msgid "Input"
 msgstr ""
 
 #. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突."
 
 #. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4148,8 +4169,8 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
 msgid "unknown"
 msgstr ""
 
@@ -4491,7 +4512,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:238
+#: src/gui/windows/inventorywindow.cpp:241
 msgid "Shop"
 msgstr "商店"
 
@@ -5551,7 +5572,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
 msgid "Quests"
 msgstr ""
 
@@ -5595,7 +5616,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:240
+#: src/gui/windows/inventorywindow.cpp:243
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5607,7 +5628,7 @@ 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:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
 #: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "背包"
@@ -5620,7 +5641,7 @@ 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:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
 #: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
@@ -5637,7 +5658,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
 msgid "Skills"
 msgstr "技能"
 
@@ -5774,7 +5795,7 @@ msgstr ""
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
 #: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立隊伍"
@@ -5880,99 +5901,100 @@ msgstr ""
 msgid "Name:"
 msgstr "名字:"
 
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: 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:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "請分配%d點數"
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: outfits window button
-#: 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:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Hair color:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
 msgid "Hair style:"
 msgstr ""
 
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "請分配%d點數"
-
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
 #. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
 msgid "M"
 msgstr ""
 
 #. TRANSLATORS: one char size other character gender
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
 msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -6228,7 +6250,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 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
@@ -6240,27 +6262,27 @@ msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6878,42 +6900,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
 msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
 msgid "Text: "
 msgstr ""
 
@@ -7597,6 +7619,16 @@ msgid "Show smiles"
 msgstr ""
 
 #. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, c-format
+msgid "Craft shortcut %d"
+msgstr ""
+
+#. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
 msgid "Emote modifiers keys"
 msgstr ""
@@ -8592,7 +8624,7 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
+msgid "Client too old or wrong server type."
 msgstr ""
 
 #. TRANSLATORS: error message
@@ -8997,7 +9029,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
 msgid "Unknown item"
 msgstr ""
 
@@ -9017,7 +9049,7 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9268,157 +9300,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
 msgid "skill"
 msgstr ""
 
@@ -9432,11 +9464,6 @@ msgstr ""
 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-29 16:40:03 +0300
committer	Andrei Karas <akaras@inbox.ru>	2016-01-29 16:40:03 +0300
commit	b4658b5317715e13f4294e5a8c60e20af8db0744 (patch)
tree	802f2f7d60be896fd41d298e1b358529936c612f /po
parent	05174b5178b28df4883f593f8105c74fa47bb8f4 (diff)
download	plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.gz plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.bz2 plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.xz plus-b4658b5317715e13f4294e5a8c60e20af8db0744.zip