Update translations.

40 files changed, 6035 insertions, 4539 deletions

diff --git a/po/ar.po b/po/ar.po
index 5b998d53d..48a7c1c2e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -344,156 +344,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -531,37 +541,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "تثبيت"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "مرئية"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -576,41 +586,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -624,10 +634,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -637,37 +647,37 @@ msgid "Error"
 msgstr "خطأ"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1424,7 +1434,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1436,12 +1446,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "إلغاء"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1466,7 +1476,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1673,7 +1683,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1840,8 +1850,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1872,7 +1882,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1902,11 +1912,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "استخدام"
 
@@ -2081,35 +2094,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "تجريد من العتاد"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "استعمال العتاد"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2117,56 +2111,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "إسقاط"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "قسم"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3177,7 +3171,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4255,7 +4249,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4481,7 +4475,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5287,7 +5281,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "العتاد"
 
@@ -5298,7 +5292,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "الجردة"
@@ -5526,7 +5520,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "كلمة السرّ:"
@@ -5568,7 +5562,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "الاسم:"
@@ -5580,8 +5574,8 @@ msgstr "الاسم:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5592,8 +5586,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5629,33 +5623,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محارف."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذف %d نقطة"
@@ -5685,7 +5679,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5862,11 +5856,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "تجريد من العتاد"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "استعمال العتاد"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6062,17 +6083,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "الخادوم:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6665,12 +6686,12 @@ msgid "You give:"
 msgstr "أنت تقدّم:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6682,36 +6703,36 @@ msgid "Name: %s"
 msgstr "الاسم: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "جارِ الاتّصال..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6974,7 +6995,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7147,43 +7168,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7191,22 +7212,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7380,125 +7401,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7554,43 +7575,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/bg.po b/po/bg.po
index 92c17d119..2f835ffd2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -572,41 +582,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr ""
@@ -5576,8 +5570,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 8dda74b2d..9309eb545 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorant sol·licituds d'intercanvi. "
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
@@ -341,156 +341,166 @@ msgstr "(U) visualització de mapa ultra 2 "
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
-msgstr "(e) visualització de mapa buida "
+msgid "(e) empty map view with collision"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr "(b) visualització de mapa blanc i negre "
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utilitza #flar per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) utilitza #chiza per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) utilitza #igrav per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) utilitza #chiza per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) utilitza #upmarmu per a atac màgic "
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr "(?) atac màgic "
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr "(D) imitació per defecte "
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr "(O) imitació de vestimenta "
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr "(?) imitació "
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr "Lluny del teclat "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr "(O) al teclat "
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr "(A) absent "
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr "(?) absent "
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr "(G) mode càmera de joc "
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr "(F) mode de càmera lliure "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr "Els modificadors de joc estan activats "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr "Els modificadors de joc estan desactivats "
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr "Bombolla flotant "
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configuració "
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vídeo "
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema "
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Ajuda "
@@ -573,41 +583,41 @@ msgstr "Ajuda "
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Iniciant sessió "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr "Entrant al mon de joc "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -621,10 +631,10 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Error "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr "Canvi de contrasenya "
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit! "
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr "Canvi de correu "
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit! "
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit "
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis... "
 
@@ -1421,7 +1431,7 @@ msgstr "Crear grup "
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr "Crear grup "
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Cancel·lar "
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr "Pes: %s"
@@ -1463,7 +1473,7 @@ msgstr "Intercanvi "
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Atacar "
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr "Conjunt  "
@@ -1837,8 +1847,8 @@ msgstr "Agregar-los tots al intercanvi "
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Botiga "
 
@@ -1869,7 +1879,7 @@ msgstr "Emmagatzema-ho tot"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Recuperar "
 
@@ -1899,11 +1909,14 @@ msgstr "Recupera-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Utilitzar "
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Des-equipar "
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equipar "
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr "Deixar caure... "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Deixar caure "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Dividir "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Botiga "
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Equipament "
 
@@ -5295,7 +5289,7 @@ msgstr "INV "
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventari "
@@ -5523,7 +5517,7 @@ msgstr "Canviar contrasenya "
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Contrasenya: "
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "nom"
@@ -5577,8 +5571,8 @@ msgstr "nom"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ">"
@@ -5589,8 +5583,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr "<"
@@ -5626,33 +5620,33 @@ msgstr "Dona"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 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:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Has de treure %d punts"
@@ -5682,7 +5676,7 @@ msgstr "Canvia compta d'accés "
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Juga"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Des-equipar "
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equipar "
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6051,17 +6072,17 @@ msgid "Custom update host"
 msgstr "Servidor d'actualització personalitzat "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Servidor: "
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6654,12 +6675,12 @@ msgid "You give:"
 msgstr "Ofereixes: "
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "No tens diners suficients.  "
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
@@ -6671,36 +6692,36 @@ msgid "Name: %s"
 msgstr "Nom: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Actualitzant... "
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Connectant... "
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1 El procés d'actualització està incomplet. "
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Això es altament recomanat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr "##1 tornes a provar més tard. "
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Complet "
 
@@ -6963,7 +6984,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7136,43 +7157,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr "Error desconegut. "
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7180,22 +7201,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7369,125 +7390,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr "Autenticació fallida. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr "No hi ha cap servidor disponible. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr "Algú altre està provant d'utilitzar aquest compte. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr "Aquest compte ja està sent utilitzat. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr "Hack de desplaçament ràpid detectat. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr "Accès de sessió duplicat.  "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr "Error de connexió desconegut. "
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Has estat desconnectat del servidor!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Força "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Agilitat "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Vitalitat "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intel·ligència  "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Destresa "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Sort "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr "Defensa "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr "Atac màgic "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr "Defensa màgica "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% de Precisió "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr "% de Evasió "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr "% de Crític "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr "Retard d'atac "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr "Demora a peu "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr "Distància d'atac "
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7543,43 +7564,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom "
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Objecte desconegut "
 
diff --git a/po/cs.po b/po/cs.po
index be6bc6ecf..2c089109b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-07-10 18:01+0000\n"
-"Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
@@ -346,15 +346,13 @@ msgstr "(U) ultra zobrazení mapy 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) zobrazen prázdné mapy"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) zobrazen prázdné mapy"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -363,9 +361,8 @@ msgstr "(b) zobrazení černobílé mapy"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) debug zobrazení mapy"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1926,7 +1923,9 @@ msgstr "Vzít všechny"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Použít"
 
@@ -3202,7 +3201,7 @@ msgid "Edit"
 msgstr "Upravit"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
@@ -4486,9 +4485,8 @@ msgstr "Zobrazit objekty průhledné"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Povolit přeřazení obrázků."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6419,19 +6417,19 @@ msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
@@ -7610,15 +7608,15 @@ msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Kritický zásah"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Útok %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7628,15 +7626,15 @@ msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Obrana %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/da.po b/po/da.po
index f53de2d68..626b8adb1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Opsætning"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Hjælp"
@@ -573,41 +583,41 @@ msgstr "Hjælp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Luk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Forbinder til server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Logger ind"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -621,10 +631,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Fejl"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1421,7 +1431,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Fortryd"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr "Handl"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Angrib"
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Gem på lager"
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Brug"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Tag af"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Tag på"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Smid"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Opdel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "butik"
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Udstyr"
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventarliste"
@@ -5523,7 +5517,7 @@ msgstr "Skift adgangskode"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Adgangskode:"
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Navn:"
@@ -5577,8 +5571,8 @@ msgstr "Navn:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5589,8 +5583,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5626,33 +5620,33 @@ msgstr "Kvinde"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spil"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Tag af"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Tag på"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6051,17 +6072,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6654,12 +6675,12 @@ msgid "You give:"
 msgstr "Du giver:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på vinduet."
@@ -6671,36 +6692,36 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Updatere..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Udført"
 
@@ -6963,7 +6984,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7136,43 +7157,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7180,22 +7201,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7369,125 +7390,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Styrke"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Adræthed"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Helbred"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligens"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Behændighed"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Held"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7543,43 +7564,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unavngivet"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Ukendt genstand"
 
diff --git a/po/de.po b/po/de.po
index 8414f2425..df1d4a1cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
 "de/)\n"
@@ -354,15 +354,13 @@ msgstr "(U) Ultra Kartenansicht 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) Leere Kartenansicht"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) Leere Kartenansicht"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -371,9 +369,8 @@ msgstr "(b) Schwarz-Weiß Kartenansicht"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) Debug Kartenansicht"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1936,7 +1933,9 @@ msgstr "Alles abholen"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Benutzen"
 
@@ -3212,7 +3211,7 @@ msgid "Edit"
 msgstr "Ändern"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -4494,9 +4493,8 @@ msgstr "Zeige die Transperenz von Entitäten"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Aktiviere Neuordnung der Sprites."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6422,19 +6420,19 @@ msgid "Up"
 msgstr "Erhöhen"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeiten Tab %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
@@ -7621,15 +7619,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Kritischer Treffer"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "M.Angriff:"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7645,9 +7643,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "M.Verteidigung:"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/el.po b/po/el.po
index 78f25bfcc..f50620b5b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/manaplus/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Αποδεχόμενος τα εισερχόμενα αιτήματα του εμπορίου"
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Ρύθμισεις"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Βοήθεια"
@@ -572,41 +582,41 @@ msgstr "Βοήθεια"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Κλείσιμο"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Σύνδεση σε τονδιακομιστή"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Σύνδεση"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr "Μπαίνοντας στον κόσμο του παιχνιδιού "
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr "Αναζητώντας χαρακτήρες"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr "Σύνδεση με τον διακομιστή του παιχνιδιού"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 
@@ -620,10 +630,10 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Σφάλμα"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Αναζητούνται τα στοιχεία της εγγραφής"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr "Αλλαγή ηλεκτρονικού ταχυδρομείου"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr "Ηλεκτρονικό ταχυδρομείο άλλαξε με επιτυχία!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr "Διαγραφή Επιτυχής"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr "Αντίο, να επιστρέψεις κάθε στιγμή ..."
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Ακύρωση"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Επίθεση"
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr "Ρούχα"
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Κατάστημα"
 
@@ -1868,7 +1878,7 @@ msgstr "Αποθηκεύστε όλα τα"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Ανάκτηση"
 
@@ -1898,11 +1908,14 @@ msgstr "Ανέκτησε όλα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Χρήση"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equip"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr "Πέτα ..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Πέτα"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Διαίρεση"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Κατάστημα"
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Εξοπλισμός"
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr "Αλλαγή κωδικού πρόσβασης"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Όνομα:"
@@ -5576,8 +5570,8 @@ msgstr "Όνομα:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ">"
@@ -5588,8 +5582,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr "<"
@@ -5625,33 +5619,33 @@ msgstr "Γυναίκα"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Παρακαλούμε να διανείμετε %d πόντους"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Το όνομά σας πρέπει να είναι τουλάχιστον 4 χαρακτήρες."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Στατιστικά χαρακτηρα:εντάξει"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Παρακαλώ αφαιρέστε %d πόντους"
@@ -5681,7 +5675,7 @@ msgstr "Διακόπτης Σύνδεση"
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equip"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Διακοσμιτής:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index f3db849e5..5db365ce9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Setup"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Help"
@@ -573,41 +583,41 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Close"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Logging in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr "Entering game world"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
@@ -621,10 +631,10 @@ msgstr "Changing game servers"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr "Password Change"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1421,7 +1431,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Cancel"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr "Trade"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Attack"
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Store"
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Retrieve"
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Use"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Unequip"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equip"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Drop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Split"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Shop"
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventory"
@@ -5523,7 +5517,7 @@ msgstr "Change Password"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Password:"
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Name:"
@@ -5577,8 +5571,8 @@ msgstr "Name:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5589,8 +5583,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5626,33 +5620,33 @@ msgstr "Female"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Play"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Unequip"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equip"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6051,17 +6072,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6654,12 +6675,12 @@ msgid "You give:"
 msgstr "You give:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Failed adding item. You can not overlap one kind of item on the window."
@@ -6671,36 +6692,36 @@ msgid "Name: %s"
 msgstr "Name: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Updating..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Completed"
 
@@ -6963,7 +6984,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7136,43 +7157,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7180,22 +7201,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7369,125 +7390,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7543,43 +7564,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "unnamed"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Unknown item"
 
diff --git a/po/eo.po b/po/eo.po
index b10bc1c0e..bccffbac0 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Helpo"
@@ -573,41 +583,41 @@ msgstr "Helpo"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Fermi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -621,10 +631,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Eraro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1421,7 +1431,7 @@ msgstr "Krei partion"
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr "Krei partion"
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Nuligi"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Uzi"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5523,7 +5517,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Nomo:"
@@ -5577,8 +5571,8 @@ msgstr "Nomo:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ">"
@@ -5589,8 +5583,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr "<"
@@ -5626,33 +5620,33 @@ msgstr "Ina"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Ludi"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6051,17 +6072,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Servilo:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6654,12 +6675,12 @@ msgid "You give:"
 msgstr "Vi donas:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6671,36 +6692,36 @@ msgid "Name: %s"
 msgstr "Nomo: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6963,7 +6984,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr "Nekorekta nomo."
 
@@ -7136,43 +7157,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7180,22 +7201,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7369,125 +7390,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Forto"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Rapideco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Lerteco"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7543,43 +7564,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sennoma"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 7a80d4818..127832c0c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-07-14 12:09+0000\n"
-"Last-Translator: osuka <owen942009@gmail.com>\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
 "language/es/)\n"
 "Language: es\n"
@@ -350,15 +350,13 @@ msgstr "(U) vista extremista 2 del mapa"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) vista vacía del mapa"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) vista vacía del mapa"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -367,9 +365,8 @@ msgstr "(b) vista del mapa en blanco y negro"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) vista de depuración del mapa"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1931,7 +1928,9 @@ msgstr "Recuperar todo"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
@@ -3207,7 +3206,7 @@ msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -4493,9 +4492,8 @@ msgstr "Mostrar transparencia de criaturas"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Habilitar re-ordenamiento de sprites."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6432,19 +6430,19 @@ msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
@@ -7630,15 +7628,15 @@ msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Golpe crítico"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Ataque %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7648,15 +7646,15 @@ msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Defensa %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Defensa %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/et.po b/po/et.po
index 2a26e566a..48cee685e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Abi"
@@ -572,41 +582,41 @@ msgstr "Abi"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Sulge"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Viga"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr ""
@@ -5576,8 +5570,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "Naine"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "Nimi: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/fa.po b/po/fa.po
index 04dd44326..f5505cd5f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -571,41 +581,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr "خطا"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "انصراف"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "تجهیزات"
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5521,7 +5515,7 @@ msgstr "تغییر گذرواژه"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "گذرواژه:"
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "نام"
@@ -5575,8 +5569,8 @@ msgstr "نام"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr "زن"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6047,17 +6068,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6650,12 +6671,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6667,36 +6688,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6959,7 +6980,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7132,43 +7153,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7176,22 +7197,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7365,125 +7386,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7539,43 +7560,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 5458e0ce4..7d042c01e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
 "language/fi/)\n"
@@ -342,15 +342,13 @@ msgstr "(U) ultra-karttanäkymä 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) tyhjä karttanäkymä"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) tyhjä karttanäkymä"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -359,9 +357,8 @@ msgstr "(b) mustavalkoinen karttanäkymä"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) debug-karttanäkymä"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1924,7 +1921,9 @@ msgstr "Ota kaikki"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Käytä"
 
@@ -3200,7 +3199,7 @@ msgid "Edit"
 msgstr "Muokkaa"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -4482,9 +4481,8 @@ msgstr "Näytä olioiden läpinäkyvyys"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Ota käyttöön uudelleenjärjestyshahmot"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6401,19 +6399,19 @@ msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, 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:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
@@ -7591,15 +7589,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Täysosuma"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "T.-hyökkäys"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7615,9 +7613,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "T.-puolustus"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/fr.po b/po/fr.po
index ab4f1f976..5413cf09c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-29 01:16+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -350,15 +350,13 @@ msgstr "(u) Vue du jeu mode Ultra 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) Vue de la carte vide"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) Vue de la carte vide"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -367,9 +365,8 @@ msgstr "(b) Vue de la carte en N&B"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) Vue du jeu mode déverminage"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1934,7 +1931,9 @@ msgstr "Reprendre tout"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Utiliser"
 
@@ -3210,7 +3209,7 @@ msgid "Edit"
 msgstr "Éditer"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -4495,9 +4494,8 @@ msgstr "Afficher les créatures en transparence"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Autoriser la réorganisation des cartes éléments de dessin"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6432,19 +6430,19 @@ msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
@@ -7640,15 +7638,15 @@ msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Coup critique"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Attaque %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7658,15 +7656,15 @@ msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Défense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Défense %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/he.po b/po/he.po
index 5a6ee2d81..9a600535e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "מתעלם מהצעות סחר נכנסות"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "מאשר הצעות סחר נכנסות"
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "הגדרות"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "וידאו"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "עזרה"
@@ -572,41 +582,41 @@ msgstr "עזרה"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "סגור"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "שגיאה"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "בטל"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr "סחרר"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "תקוף"
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "אחסן"
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "החזר"
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "השתמש"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "הורד"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "השתמש"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "השלך"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "פצל"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "חנות"
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "לבוש"
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "ציוד"
@@ -5522,7 +5516,7 @@ msgstr "שנה סיסמה"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "סיסמה:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "שם:"
@@ -5576,8 +5570,8 @@ msgstr "שם:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "נקבה"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "אנא חלק %d נקודות"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוים בשם."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "נתוני שחקן - אישור"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "אנא הסר %d נקודות"
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "שחק"
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "הורד"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "השתמש"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "שרת:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr "אתה נותן:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "אין לך מספיק כסף."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. לא ניתן להכניס מעל חפץ אחד לחלון."
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "שם: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "מעדכן..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון לא תם."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מאוחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "הסתיים"
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "עוצמה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "זריזות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "חיוניות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "תבונה"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "מיומנות"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "מזל"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "ללא שם"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "חפץ לא ידוע"
 
diff --git a/po/hr.po b/po/hr.po
index da324b466..badae0ec3 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Podešavanje"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Slika"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Pomoć"
@@ -573,41 +583,41 @@ msgstr "Pomoć"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Zatvori"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -621,10 +631,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Greška"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1421,7 +1431,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Poništi"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr "Trgovanje"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Napad"
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Pohrani"
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Preuzmi"
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Upotrijebi"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Skini opremu"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Opremi"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Ispusti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Razdvoji"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Trgovina"
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Oprema"
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Zalihe"
@@ -5523,7 +5517,7 @@ msgstr "Promijeni Lozinku"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Lozinka"
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Ime:"
@@ -5577,8 +5571,8 @@ msgstr "Ime:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5589,8 +5583,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5626,33 +5620,33 @@ msgstr "Žensko"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Igraj"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Skini opremu"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Opremi"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6053,17 +6074,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Poslužitelj:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6656,12 +6677,12 @@ msgid "You give:"
 msgstr "Daješ:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6673,36 +6694,36 @@ msgid "Name: %s"
 msgstr "Ime: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Ažuriranje"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporučljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -6965,7 +6986,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7138,43 +7159,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7182,22 +7203,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7371,125 +7392,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Snaga"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Okretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Vitalnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Inteligencija"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Spretnost"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Sreća"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7545,43 +7566,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "neimenovano"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
 
diff --git a/po/hu.po b/po/hu.po
index 20dcc9b53..7a40b319c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Beállítások"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Videó"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Súgó"
@@ -572,41 +582,41 @@ msgstr "Súgó"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Bezár"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Hiba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Mégse"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr "Üzlet"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Támadás"
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Raktároz"
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Magához vesz"
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Bevet"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Nem használ"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Használ"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Eldob"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Felosztás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Üzlet"
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Felszerelés"
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Táska"
@@ -5522,7 +5516,7 @@ msgstr "Jelszó módosítása"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Jelszó:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Név:"
@@ -5576,8 +5570,8 @@ msgstr "Név:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "Nő"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Játék"
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Nem használ"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Használ"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Szerver:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr "Adott tárgyak:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "Név: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Frissítés…"
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Kész"
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Erő"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Mozgékonyság"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Egészség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligencia"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Ügyesség"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Szerencse"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Névtelen"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
 
diff --git a/po/id.po b/po/id.po
index e9468dbe9..9e585b387 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
 "language/id/)\n"
@@ -342,15 +342,13 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) penampilan peta kosong"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) penampilan peta kosong"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -359,9 +357,8 @@ msgstr "(b)penampilan peta hitam & putih"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(e) penampilan peta kosong"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1923,7 +1920,9 @@ msgstr "Ambil semua"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gunakan"
 
@@ -3199,7 +3198,7 @@ msgid "Edit"
 msgstr "Ganti"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -6394,19 +6393,19 @@ msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
@@ -7582,15 +7581,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Pukulan kritis:"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "serang mob"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
diff --git a/po/it.po b/po/it.po
index 88cfb882c..19b55e73c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
 "language/it/)\n"
@@ -362,9 +362,8 @@ msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(?) Movimento casuale"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1927,7 +1926,9 @@ msgstr "Ritira tutto"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usa"
 
@@ -3203,7 +3204,7 @@ msgid "Edit"
 msgstr "Modifica"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -4485,9 +4486,8 @@ msgstr "Mostra trasparenza personaggi"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Abilita Riordina Sprites."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6409,19 +6409,19 @@ msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
@@ -7607,15 +7607,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Colpo critico"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Attacco magico."
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7631,9 +7631,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Difesa Magica."
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/ja.po b/po/ja.po
index 12095c218..78e1e64bd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
 "language/ja/)\n"
@@ -345,15 +345,13 @@ msgstr "(U) ウルトラマップビュー2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) 空マップビュー"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) 空マップビュー"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -362,9 +360,8 @@ msgstr "(b) 白黒マップビュー"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) デバッグマップビュー"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1926,7 +1923,9 @@ msgstr "全部取出す"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
@@ -3202,7 +3201,7 @@ msgid "Edit"
 msgstr "編集"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -4484,9 +4483,8 @@ msgstr "透過を表示する"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "スプライトリオーダーを有効にする."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6400,19 +6398,19 @@ msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
@@ -7595,15 +7593,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "クリティカルヒット"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "M.Attack"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7619,9 +7617,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "M.Defense"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/ka.po b/po/ka.po
index 93e20eaca..dc5dde5b1 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -571,41 +581,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5521,7 +5515,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr ""
@@ -5575,8 +5569,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6047,17 +6068,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6650,12 +6671,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6667,36 +6688,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6959,7 +6980,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7132,43 +7153,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7176,22 +7197,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7365,125 +7386,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7539,43 +7560,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 9ec6d13af..b2586cbf2 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: 2014-07-15 02:58+0300\n"
+"POT-Creation-Date: 2014-07-15 22:53+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"
@@ -1915,7 +1915,9 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -3191,7 +3193,7 @@ msgid "Edit"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -6388,19 +6390,19 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index d8b5bb62d..dd38e5b14 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Hjelp"
@@ -572,41 +582,41 @@ msgstr "Hjelp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Lukk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Feil"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Bruk"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Del opp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Butikk"
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Utstyr"
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr "Endre passord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Passord:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Navn:"
@@ -5576,8 +5570,8 @@ msgstr "Navn:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "Kvinne"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vennligst distribuer %d poeng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Navnet ditt må minst være 4 bokstaver."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "Navn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 02d2049e4..6d14fcb1e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Help"
@@ -573,41 +583,41 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Aanmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr "Spelwereld binnengaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr "Personages aanvragen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr "Van spelserver wissellen"
 
@@ -621,10 +631,10 @@ msgstr "Van spelserver wissellen"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Registratiedetails aanvragen"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr "Verander Wachtwoord"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr "Wachtwoord veranderen geslaagd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr "Verander E-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr "E-mail veranderen geslaagd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr "Uitschrijven geslaagd!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr "Vaarwel, je mag altijd terugkomen..."
 
@@ -1421,7 +1431,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr "Handel"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Aanvallen"
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Afdoen"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Uitrusten"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Splitsen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Winkel"
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5523,7 +5517,7 @@ msgstr "Wijzig wachtwoord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Naam:"
@@ -5577,8 +5571,8 @@ msgstr "Naam:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5589,8 +5583,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5626,33 +5620,33 @@ msgstr "Vrouwelijk"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 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:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spelen"
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Afdoen"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Uitrusten"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6051,17 +6072,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6654,12 +6675,12 @@ msgid "You give:"
 msgstr "Je geeft:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
@@ -6671,36 +6692,36 @@ msgid "Name: %s"
 msgstr "Naam: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Actualiseren..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6963,7 +6984,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7136,43 +7157,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7180,22 +7201,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7369,125 +7390,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Kracht"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Behendigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Vitaliteit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligentie"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Geluk"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7543,43 +7564,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0deb82c83..52aeca324 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
 "language/nl_BE/)\n"
@@ -343,15 +343,13 @@ msgstr "(U) ultra map tonen 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) lege map tonen"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) lege map tonen"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -360,9 +358,8 @@ msgstr "(b) zwart & witte map tonen"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) debug map tonen"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1924,7 +1921,9 @@ msgstr "Haal alles op"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Gebruiken"
 
@@ -3200,7 +3199,7 @@ msgid "Edit"
 msgstr "Wijzig"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -6403,19 +6402,19 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
@@ -7597,15 +7596,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Kritieke aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "M.Aanval"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7621,9 +7620,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "M.Verdediging"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/pl.po b/po/pl.po
index cdf9cf19f..e6f57b6ff 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
 "pl/)\n"
@@ -347,15 +347,13 @@ msgstr "(U) płaska mapa 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) mapa bez tekstur"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) mapa bez tekstur"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -364,9 +362,8 @@ msgstr "(b) dwukolorowa mapa"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) widok debug"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1926,7 +1923,9 @@ msgstr "Odbierz wszystko"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Użyj"
 
@@ -3202,7 +3201,7 @@ msgid "Edit"
 msgstr "Edycja"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -4484,9 +4483,8 @@ msgstr "Pokaż przezroczystość istot"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Włącz reorganizację obrazków"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6414,19 +6412,19 @@ msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, 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:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
@@ -7609,15 +7607,15 @@ msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Uderzenie Krytyczne"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Atak %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7627,15 +7625,15 @@ msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Obrona %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Obrona %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/pt.po b/po/pt.po
index 0c8427c19..95284c98b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
 "language/pt/)\n"
@@ -344,15 +344,13 @@ msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) Visualizador de mapa vazio"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) Visualizador de mapa vazio"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -361,9 +359,8 @@ msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) Visualizador de mapa depurador"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1925,7 +1922,9 @@ msgstr "Retirar tudo"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
@@ -3201,7 +3200,7 @@ msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -4483,9 +4482,8 @@ msgstr "Mostrar transparencia "
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Habilitar reordenar sprites"
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6410,19 +6408,19 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, 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:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
@@ -7610,15 +7608,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Golpe crítico"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Atq. Mágico"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7634,9 +7632,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Def. Mágica"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 186399c0a..60b82c394 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-07-05 17:00+0000\n"
-"Last-Translator: Jonatas L. Nogueira <cpntb1@ymail.com>\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "manaplus/language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -351,15 +351,13 @@ msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) Visualizador de mapa vazio"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) Visualizador de mapa vazio"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -368,9 +366,8 @@ msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) Visualizador de mapa depurador"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1932,7 +1929,9 @@ msgstr "Retirar tudo"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Usar"
 
@@ -3208,7 +3207,7 @@ msgid "Edit"
 msgstr "Editar"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -4491,9 +4490,8 @@ msgstr "Mostrar transparencia"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Habilitar reordenar sprites."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6421,19 +6419,19 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, 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:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
@@ -7620,15 +7618,15 @@ msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Golpe crítico"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Ataque %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7638,15 +7636,15 @@ msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Defesa %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Defesa %s"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/ru.po b/po/ru.po
index 3e3e9073f..57151220a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 10:24+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 10:17+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
 "language/ru/)\n"
@@ -350,15 +350,13 @@ msgstr "(U) специальный режим карты 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-#, fuzzy
 msgid "(e) empty map view with collision"
-msgstr "(e) режим пустой карты"
+msgstr "(e) режим пустой карты с коллизиями"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
-#, fuzzy
 msgid "(E) empty map view"
-msgstr "(e) режим пустой карты"
+msgstr "(E) режим пустой карты"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1540
@@ -367,9 +365,8 @@ msgstr "(b) черно-белый режим карты"
 
 #. TRANSLATORS: pickup size in status bar
 #: src/being/localplayer.cpp:1542
-#, fuzzy
 msgid "(?) map view"
-msgstr "(D) отладочный режим карты"
+msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
 #: src/being/localplayer.cpp:1562
@@ -1932,7 +1929,9 @@ msgstr "Получить все"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Использовать"
 
@@ -3208,7 +3207,7 @@ msgid "Edit"
 msgstr "Изменить"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -4494,9 +4493,8 @@ msgstr "Отображать прозрачность на персонажах
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-#, fuzzy
 msgid "Enable reorder sprites (need for mods support)."
-msgstr "Включить перестановку спрайтов"
+msgstr "Включить перестановку спрайтов (нужен для модов)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -6427,19 +6425,19 @@ msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Умение %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Умение %d"
@@ -7624,15 +7622,15 @@ msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Критический удар"
+msgstr "Критическая атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Атака %s"
+msgstr "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7642,15 +7640,15 @@ msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:106
-#, fuzzy, c-format
+#, c-format
 msgid "Critical defense %s"
-msgstr "Защита %s"
+msgstr "Защита от критической атаки %s"
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "Защита %s"
+msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
@@ -7674,19 +7672,19 @@ msgstr "Уровень: %s"
 #: src/resources/db/itemdb.cpp:116
 #, c-format
 msgid "Speed %s"
-msgstr ""
+msgstr "Скорость %s"
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:118
 #, c-format
 msgid "Range %s"
-msgstr ""
+msgstr "Расстояние %s"
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:120
 #, c-format
 msgid "Flee %s"
-msgstr ""
+msgstr "Уклонение %s"
 
 #. TRANSLATORS: item name
 #: src/resources/db/itemdb.cpp:210
diff --git a/po/sk.po b/po/sk.po
index c8420fa84..8a03f5d0f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -341,156 +341,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -528,37 +538,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Nastavenie"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Nápoveda"
@@ -573,41 +583,41 @@ msgstr "Nápoveda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Zatvoriť"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -621,10 +631,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -634,37 +644,37 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1421,7 +1431,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1433,12 +1443,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1463,7 +1473,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1670,7 +1680,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1837,8 +1847,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1869,7 +1879,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1899,11 +1909,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Použiť"
 
@@ -2078,35 +2091,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Odstrojiť"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Vystrojiť"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2114,56 +2108,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Zahodiť"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3174,7 +3168,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4252,7 +4246,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Obchod"
 
@@ -4478,7 +4472,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5284,7 +5278,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Vybavenie"
 
@@ -5295,7 +5289,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventár"
@@ -5523,7 +5517,7 @@ msgstr "Zmeniť heslo"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Heslo:"
@@ -5565,7 +5559,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Meno"
@@ -5577,8 +5571,8 @@ msgstr "Meno"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5589,8 +5583,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5626,33 +5620,33 @@ msgstr "Žena"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prosím rozdeľ %d bodov"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tvoje meno musí mať aspoň 4 písmená."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Charakterové staty OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
@@ -5682,7 +5676,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5859,11 +5853,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Odstrojiť"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Vystrojiť"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6053,17 +6074,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6656,12 +6677,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6673,36 +6694,36 @@ msgid "Name: %s"
 msgstr "Meno: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6965,7 +6986,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7138,43 +7159,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7182,22 +7203,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7371,125 +7392,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7545,43 +7566,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/sq.po b/po/sq.po
index 06cab5a68..5f450cace 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -572,41 +582,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr ""
@@ -5576,8 +5570,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index d38c185f9..e9a233d51 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/manaplus/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Hjälp"
@@ -572,41 +582,41 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Fel"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr "Byteshandla"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Hämta"
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Använd"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Avrusta"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Utrusta"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Släpp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Affär"
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Utrustning"
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventarium"
@@ -5522,7 +5516,7 @@ msgstr "Ändra lösenord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Lösenord:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Namn:"
@@ -5576,8 +5570,8 @@ msgstr "Namn:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "Kvinna"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 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:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spela"
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Avrusta"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Utrusta"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags sak flera gånger."
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "Namn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Styrka"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Smidighet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Hälsa"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligens"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Skicklighet"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Tur"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "namnlös"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Okänt föremål"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1cc532963..fac257961 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
@@ -340,156 +340,166 @@ msgstr "(U) ultra-kartvy 2"
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
-msgstr "(e) tom kartvy"
+msgid "(e) empty map view with collision"
+msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr "(b) svartvit kartvy"
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr "(f) använd #flar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) använd #chiza för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) använd #ingrav för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) använd #frillyar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) använd #upmarmu för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr "(?) magic attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr "(a) attackera alla spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr "(f) attackera alla utom dina friends"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr "(b) attackera dåliga relationer"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr "(d) attackera inte spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr "(?) pvp-attack"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr "(D) Standardimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr "(O) klädselimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr "Iväg"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr "(O) på tangentbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr "(A) away"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr "(G) spelkamera-läge"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr "Game modifiers är aktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr "Game modifiers är inaktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr "Game modifiers är okända"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -527,37 +537,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "Hjälp"
@@ -572,41 +582,41 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -620,10 +630,10 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -1420,7 +1430,7 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr "Skapa Party"
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr "Vikt: %s"
@@ -1462,7 +1472,7 @@ msgstr "Trade"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "Attackera"
 
@@ -1669,7 +1679,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -1836,8 +1846,8 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "Lagra"
 
@@ -1868,7 +1878,7 @@ msgstr "Lagra alla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -1898,11 +1908,14 @@ msgstr "Hämta ut alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Använd"
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "Unequip"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "Equip"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2113,56 +2107,56 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "Dela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr "Sparka"
 
@@ -3173,7 +3167,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "Shop"
 
@@ -4477,8 +4471,8 @@ msgstr "Visa genomskinliga varelser "
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
-msgstr "Aktivera återordna sprites."
+msgid "Enable reorder sprites (need for mods support)."
+msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:114
@@ -5283,7 +5277,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5294,7 +5288,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "Inventory"
@@ -5522,7 +5516,7 @@ msgstr "Ändra Lösenord"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "Lösenord:"
@@ -5564,7 +5558,7 @@ msgstr "Ny karaktär"
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "Namn:"
@@ -5576,8 +5570,8 @@ msgstr "Namn:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ">"
@@ -5588,8 +5582,8 @@ msgstr ">"
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr "<"
@@ -5625,33 +5619,33 @@ msgstr "Kvinna"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr "Race:"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr "Utseende:"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 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:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -5681,7 +5675,7 @@ msgstr "Ändra inloggad"
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "Spela"
 
@@ -5858,11 +5852,38 @@ msgstr "Normal font"
 msgid "Fonts"
 msgstr "Fonter"
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "Unequip"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr "Viste du att..."
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "Equip"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr "Anpassad uppdatering-host"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "Server:"
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr "Uppdatera host: %s"
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr "Öppna register-url"
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr "Du ger:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "Namn: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1 Uppdateringsprocessen är inte fullständig."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Det är starkt rekommenderat att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr "Fel namn."
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr "Okänt fel."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr "Luck %s"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "Du blev frånkopplad från servern!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "Strength"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "Agility"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "Vitality"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "Dexterity"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "Luck"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr "Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr "M.Attack"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr "M.Defense"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr "% Critical Hit"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr "Attack Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr "Walk Delay"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr "Attack Range"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr "Damage per sec."
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "Okänt item"
 
diff --git a/po/te.po b/po/te.po
index fc0b9e34e..b05eaaf7e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -340,156 +340,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -527,37 +537,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "సహాయం"
@@ -572,41 +582,41 @@ msgstr "సహాయం"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -620,10 +630,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -633,37 +643,37 @@ msgid "Error"
 msgstr "పొరపాటు"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1420,7 +1430,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1432,12 +1442,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1462,7 +1472,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1669,7 +1679,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1836,8 +1846,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1868,7 +1878,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1898,11 +1908,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2077,35 +2090,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2113,56 +2107,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3173,7 +3167,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4251,7 +4245,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4477,7 +4471,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5283,7 +5277,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5294,7 +5288,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5522,7 +5516,7 @@ msgstr "సంకేతపదాన్ని మార్చు"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "సంకేతపదం:"
@@ -5564,7 +5558,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "పేరు:"
@@ -5576,8 +5570,8 @@ msgstr "పేరు:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5588,8 +5582,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5625,33 +5619,33 @@ msgstr "స్త్రీ"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "మీ పేరు కనీసం 4 అక్షరాల పొడవుండాలి."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5681,7 +5675,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5858,11 +5852,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6050,17 +6071,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6653,12 +6674,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6670,36 +6691,36 @@ msgid "Name: %s"
 msgstr "పేరు: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6962,7 +6983,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7135,43 +7156,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7179,22 +7200,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7368,125 +7389,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7542,43 +7563,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/th.po b/po/th.po
index dfff15808..199fb932c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "ตั้งค่า"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -571,41 +581,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr "ผิดพลาด"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "ใช้"
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "ทิ้ง"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5521,7 +5515,7 @@ msgstr "เปลี่ยนรหัสผ่าน"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "รหัสผ่าน:"
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "ชื่อ:"
@@ -5575,8 +5569,8 @@ msgstr "ชื่อ:"
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr "หญิง"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6047,17 +6068,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6650,12 +6671,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6667,36 +6688,36 @@ msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6959,7 +6980,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7132,43 +7153,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7176,22 +7197,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7365,125 +7386,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7539,43 +7560,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 2e04f7072..68205c513 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
 "language/tr/)\n"
@@ -1921,7 +1921,9 @@ msgstr "Tamamını geri al"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "Kullan"
 
@@ -3197,7 +3199,7 @@ msgid "Edit"
 msgstr "Dünzenle"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -6397,19 +6399,19 @@ msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
@@ -7585,15 +7587,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "Kritik Vuruş"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "Saldırılacak canavarlar"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
diff --git a/po/vls.po b/po/vls.po
index 1eca10cd5..d221613af 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr ""
@@ -571,41 +581,41 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr ""
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr ""
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr ""
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr ""
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr ""
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr ""
@@ -5521,7 +5515,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr ""
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr ""
@@ -5575,8 +5569,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr ""
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr ""
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr ""
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6049,17 +6070,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6652,12 +6673,12 @@ msgid "You give:"
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
@@ -6669,36 +6690,36 @@ msgid "Name: %s"
 msgstr ""
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr ""
 
@@ -6961,7 +6982,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7134,43 +7155,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7178,22 +7199,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7367,125 +7388,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7541,43 +7562,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e88e6b1f0..9ee1addf1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-07-15 02:58+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 22:53+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -1919,7 +1919,9 @@ msgstr "检索所有"
 #: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
 #: src/gui/windows/inventorywindow.cpp:178
 #: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
-#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
+#: src/gui/windows/skilldialog.cpp:143 src/gui/windows/skilldialog.cpp:280
+#: src/gui/windows/skilldialog.cpp:449 src/resources/itemtypemapdata.h:39
+#: src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
@@ -3195,7 +3197,7 @@ msgid "Edit"
 msgstr "编辑"
 
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:90 src/gui/windows/skilldialog.cpp:376
+#: src/gui/widgets/skillinfo.cpp:91 src/gui/windows/skilldialog.cpp:380
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -6390,19 +6392,19 @@ msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:189
+#: src/gui/windows/skilldialog.cpp:191
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:249
+#: src/gui/windows/skilldialog.cpp:251
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:283
+#: src/gui/windows/skilldialog.cpp:287
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
@@ -7578,15 +7580,15 @@ msgstr ""
 
 #. TRANSLATORS: item info label (attack)
 #: src/resources/db/itemdb.cpp:100
-#, fuzzy, c-format
+#, c-format
 msgid "Critical attack %s"
-msgstr "会心一击"
+msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
 #: src/resources/db/itemdb.cpp:102
-#, fuzzy, c-format
+#, c-format
 msgid "M. Attack %s"
-msgstr "攻击暴徒"
+msgstr ""
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:104
@@ -7602,9 +7604,9 @@ msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
 #: src/resources/db/itemdb.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "M. Defense %s"
-msgstr "防御"
+msgstr ""
 
 #. TRANSLATORS: item info label (health)
 #: src/resources/db/itemdb.cpp:110
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9cd5a0a08..1dce3af45 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "說明"
@@ -571,41 +581,41 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr "交易"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr ""
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr ""
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr ""
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "卸下裝備"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "裝備"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "商店"
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "物品攔"
@@ -5521,7 +5515,7 @@ msgstr ""
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "密碼："
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "名字："
@@ -5575,8 +5569,8 @@ msgstr "名字："
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr "女生"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "開始"
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "卸下裝備"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "裝備"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6047,17 +6068,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "伺服器："
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6650,12 +6671,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6667,36 +6688,36 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "已完成"
 
@@ -6959,7 +6980,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7132,43 +7153,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7176,22 +7197,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7365,125 +7386,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7539,43 +7560,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 043826d7a..3cd5cfcbe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-06-26 20:52+0300\n"
-"PO-Revision-Date: 2014-06-27 09:41+0000\n"
+"POT-Creation-Date: 2014-07-15 02:58+0300\n"
+"PO-Revision-Date: 2014-07-15 09:43+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:903
+#: src/actionmanager.cpp:905
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
 #. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:913
+#: src/actionmanager.cpp:915
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
@@ -339,156 +339,166 @@ msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1536
-msgid "(e) empty map view"
+msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
 #: src/being/localplayer.cpp:1538
+msgid "(E) empty map view"
+msgstr ""
+
+#. TRANSLATORS: map view type in status bar
+#: src/being/localplayer.cpp:1540
 msgid "(b) black & white map view"
 msgstr ""
 
+#. TRANSLATORS: pickup size in status bar
+#: src/being/localplayer.cpp:1542
+msgid "(?) map view"
+msgstr ""
+
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1558
+#: src/being/localplayer.cpp:1562
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1560
+#: src/being/localplayer.cpp:1564
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1562
+#: src/being/localplayer.cpp:1566
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1564
+#: src/being/localplayer.cpp:1568
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1566
+#: src/being/localplayer.cpp:1570
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/being/localplayer.cpp:1568
+#: src/being/localplayer.cpp:1572
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1588
+#: src/being/localplayer.cpp:1592
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1590
+#: src/being/localplayer.cpp:1594
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1592
+#: src/being/localplayer.cpp:1596
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1594
+#: src/being/localplayer.cpp:1598
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/being/localplayer.cpp:1596
+#: src/being/localplayer.cpp:1600
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1616
+#: src/being/localplayer.cpp:1620
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1618
+#: src/being/localplayer.cpp:1622
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/being/localplayer.cpp:1620
+#: src/being/localplayer.cpp:1624
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/being/localplayer.cpp:1648
+#: src/being/localplayer.cpp:1652
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1671
+#: src/being/localplayer.cpp:1675
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/being/localplayer.cpp:1673
+#: src/being/localplayer.cpp:1677
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1675 src/being/localplayer.cpp:1693
+#: src/being/localplayer.cpp:1679 src/being/localplayer.cpp:1697
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1689
+#: src/being/localplayer.cpp:1693
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/being/localplayer.cpp:1691
+#: src/being/localplayer.cpp:1695
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1718
+#: src/being/localplayer.cpp:1722
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1720
+#: src/being/localplayer.cpp:1724
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/being/localplayer.cpp:1722
+#: src/being/localplayer.cpp:1726
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:3330
+#: src/being/localplayer.cpp:3338
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3336 src/being/localplayer.cpp:3361
+#: src/being/localplayer.cpp:3344 src/being/localplayer.cpp:3369
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:3346
+#: src/being/localplayer.cpp:3354
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:3352 src/being/localplayer.cpp:3366
+#: src/being/localplayer.cpp:3360 src/being/localplayer.cpp:3374
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3712
+#: src/being/localplayer.cpp:3720
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -526,37 +536,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:910 src/gui/windowmenu.cpp:164
+#: src/client.cpp:915 src/gui/windowmenu.cpp:164
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:913 src/gui/widgets/tabs/setup_perfomance.cpp:53
+#: src/client.cpp:918 src/gui/widgets/tabs/setup_perfomance.cpp:53
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:916 src/gui/widgets/tabs/setup_video.cpp:104
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "顯示"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:919 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:922
+#: src/client.cpp:927
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:925 src/gui/windowmenu.cpp:76
+#: src/client.cpp:930 src/gui/windowmenu.cpp:76
 #: src/gui/windows/helpwindow.cpp:52
 msgid "Help"
 msgstr "說明"
@@ -571,41 +581,41 @@ msgstr "說明"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:929 src/gui/popups/popupmenu.cpp:625
+#: src/client.cpp:934 src/gui/popups/popupmenu.cpp:625
 #: src/gui/popups/popupmenu.cpp:864 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:229 src/gui/windows/npcdialog.cpp:72
+#: src/gui/windows/inventorywindow.cpp:231 src/gui/windows/npcdialog.cpp:72
 #: src/gui/windows/npcdialog.cpp:110 src/gui/windows/questswindow.cpp:75
 #: src/gui/windows/shopwindow.cpp:84
 msgid "Close"
 msgstr "關閉"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1053
+#: src/client.cpp:1058
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1101
+#: src/client.cpp:1106
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1144
+#: src/client.cpp:1149
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1268
+#: src/client.cpp:1273
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1308
+#: src/client.cpp:1313
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1320
+#: src/client.cpp:1325
 msgid "Changing game servers"
 msgstr ""
 
@@ -619,10 +629,10 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1375 src/client.cpp:1386 src/client.cpp:1572
+#: src/client.cpp:1380 src/client.cpp:1391 src/client.cpp:1577
 #: src/gui/windows/changeemaildialog.cpp:168
 #: src/gui/windows/changepassworddialog.cpp:158
-#: src/gui/windows/charcreatedialog.cpp:358
+#: src/gui/windows/charcreatedialog.cpp:368
 #: src/gui/windows/charselectdialog.cpp:275
 #: src/gui/windows/editserverdialog.cpp:194
 #: src/gui/windows/registerdialog.cpp:247
@@ -632,37 +642,37 @@ msgid "Error"
 msgstr "錯誤"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1398
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1439
+#: src/client.cpp:1444
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1441
+#: src/client.cpp:1446
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1464
+#: src/client.cpp:1469
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1466
+#: src/client.cpp:1471
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1489
+#: src/client.cpp:1494
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1491
+#: src/client.cpp:1496
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -1419,7 +1429,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:2397 src/gui/popups/popupmenu.cpp:2419
 #: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2469
 #: src/gui/popups/popupmenu.cpp:2486 src/gui/popups/popupmenu.cpp:2757
-#: src/gui/popups/popupmenu.cpp:2893 src/gui/setupactiondata.h:1919
+#: src/gui/popups/popupmenu.cpp:2883 src/gui/setupactiondata.h:1919
 #: src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/changeemaildialog.cpp:57
 #: src/gui/windows/changepassworddialog.cpp:59
@@ -1431,12 +1441,12 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:95
 #: src/gui/windows/textcommandeditor.cpp:88 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:56
-#: src/gui/windows/updaterwindow.cpp:191
+#: src/gui/windows/updaterwindow.cpp:193
 msgid "Cancel"
 msgstr "取消"
 
 #. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:197
+#: src/gui/popups/itempopup.cpp:201
 #, c-format
 msgid "Weight: %s"
 msgstr ""
@@ -1461,7 +1471,7 @@ msgstr "交易"
 #: src/gui/popups/popupmenu.cpp:162 src/gui/popups/popupmenu.cpp:266
 #: src/gui/popups/popupmenu.cpp:701 src/gui/setupactiondata.h:64
 #: src/gui/windows/botcheckerwindow.cpp:84
-#: src/net/eathena/generalhandler.cpp:256 src/net/tmwa/generalhandler.cpp:294
+#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:294
 msgid "Attack"
 msgstr "攻擊"
 
@@ -1668,7 +1678,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:573 src/gui/setupactiondata.h:2042
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:195
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:197
 #: src/gui/windows/outfitwindow.cpp:56
 msgid "Outfits"
 msgstr ""
@@ -1835,8 +1845,8 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2090
-#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:740 src/gui/windows/setupwindow.cpp:97
+#: src/gui/popups/popupmenu.cpp:2131 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/inventorywindow.cpp:735 src/gui/windows/setupwindow.cpp:97
 msgid "Store"
 msgstr "寄放"
 
@@ -1867,7 +1877,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:227
+#: src/gui/popups/popupmenu.cpp:1989 src/gui/windows/inventorywindow.cpp:229
 msgid "Retrieve"
 msgstr "取回"
 
@@ -1897,11 +1907,14 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: use item
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2821
-#: src/gui/windows/inventorywindow.cpp:176
-#: src/gui/windows/inventorywindow.cpp:658 src/gui/windows/skilldialog.cpp:68
+#. TRANSLATORS: inventory button
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2807
+#: src/gui/windows/inventorywindow.cpp:178
+#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/skilldialog.cpp:68
+#: src/resources/itemtypemapdata.h:39 src/resources/itemtypemapdata.h:43
 msgid "Use"
 msgstr "使用"
 
@@ -2076,35 +2089,16 @@ msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#. TRANSLATORS: unequip item
-#. TRANSLATORS: equipment window button
-#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2806 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:178
-#: src/gui/windows/inventorywindow.cpp:647
-msgid "Unequip"
-msgstr "卸下裝備"
-
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: use item
-#. TRANSLATORS: inventory button
-#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2812 src/gui/windows/inventorywindow.cpp:174
-#: src/gui/windows/inventorywindow.cpp:652 src/gui/windows/outfitwindow.cpp:63
-msgid "Equip"
-msgstr "裝備"
-
-#. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2832 src/gui/windows/inventorywindow.cpp:191
-#: src/gui/windows/inventorywindow.cpp:748
+#: src/gui/popups/popupmenu.cpp:2822 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/windows/inventorywindow.cpp:743
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2835
+#: src/gui/popups/popupmenu.cpp:2825
 msgid "Drop all"
 msgstr ""
 
@@ -2112,56 +2106,56 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2841 src/gui/windowmenu.cpp:131
-#: src/gui/windows/inventorywindow.cpp:753
+#: src/gui/popups/popupmenu.cpp:2831 src/gui/windowmenu.cpp:131
+#: src/gui/windows/inventorywindow.cpp:748
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: split items
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windows/inventorywindow.cpp:193
+#: src/gui/popups/popupmenu.cpp:2839 src/gui/windows/inventorywindow.cpp:195
 msgid "Split"
 msgstr "分開"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2859
+#: src/gui/popups/popupmenu.cpp:2849
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2867
+#: src/gui/popups/popupmenu.cpp:2857
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2872
+#: src/gui/popups/popupmenu.cpp:2862
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2875
+#: src/gui/popups/popupmenu.cpp:2865
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2868
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2881
+#: src/gui/popups/popupmenu.cpp:2871
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2886
+#: src/gui/popups/popupmenu.cpp:2876
 msgid "Kick"
 msgstr ""
 
@@ -3172,7 +3166,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:142
-#: src/gui/windows/inventorywindow.cpp:571 src/gui/windows/statuswindow.cpp:74
+#: src/gui/windows/inventorywindow.cpp:573 src/gui/windows/statuswindow.cpp:74
 #: src/gui/windows/statuswindow.cpp:235 src/gui/windows/statuswindow.cpp:342
 #, c-format
 msgid "Money: %s"
@@ -4250,7 +4244,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #: src/gui/widgets/tabs/setup_other.cpp:263 src/gui/windowmenu.cpp:139
 #: src/gui/windows/buyselldialog.cpp:39 src/gui/windows/buyselldialog.cpp:50
-#: src/gui/windows/inventorywindow.cpp:197
+#: src/gui/windows/inventorywindow.cpp:199
 msgid "Shop"
 msgstr "商店"
 
@@ -4476,7 +4470,7 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:109
-msgid "Enable reorder sprites."
+msgid "Enable reorder sprites (need for mods support)."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5282,7 +5276,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
 #: src/gui/windowmenu.cpp:101 src/gui/windows/equipmentwindow.cpp:64
-#: src/gui/windows/inventorywindow.cpp:199
+#: src/gui/windows/inventorywindow.cpp:201
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5293,7 +5287,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:134
+#: src/gui/windowmenu.cpp:104 src/gui/windows/inventorywindow.cpp:136
 #: src/inventory.cpp:262
 msgid "Inventory"
 msgstr "物品攔"
@@ -5521,7 +5515,7 @@ msgstr "變更密碼"
 #. TRANSLATORS: register dialog. label.
 #. TRANSLATORS: unregister dialog. label.
 #: src/gui/windows/changepassworddialog.cpp:69
-#: src/gui/windows/logindialog.cpp:108 src/gui/windows/registerdialog.cpp:79
+#: src/gui/windows/logindialog.cpp:109 src/gui/windows/registerdialog.cpp:79
 #: src/gui/windows/unregisterdialog.cpp:67
 msgid "Password:"
 msgstr "密碼："
@@ -5563,7 +5557,7 @@ msgstr ""
 #. TRANSLATORS: login dialog label
 #. TRANSLATORS: register dialog. label.
 #: src/gui/windows/charcreatedialog.cpp:82
-#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:74 src/gui/windows/logindialog.cpp:107
 #: src/gui/windows/registerdialog.cpp:77
 msgid "Name:"
 msgstr "名字："
@@ -5575,8 +5569,8 @@ msgstr "名字："
 #: src/gui/windows/charcreatedialog.cpp:86
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:182
 #: src/gui/windows/charcreatedialog.cpp:192
+#: src/gui/windows/charcreatedialog.cpp:202
 #: src/gui/windows/outfitwindow.cpp:61
 msgid ">"
 msgstr ""
@@ -5587,8 +5581,8 @@ msgstr ""
 #. TRANSLATORS: outfits window button
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:184
 #: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:204
 #: src/gui/windows/outfitwindow.cpp:59
 msgid "<"
 msgstr ""
@@ -5624,33 +5618,33 @@ msgstr "女生"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:124
-#: src/gui/windows/charcreatedialog.cpp:467
+#: src/gui/windows/charcreatedialog.cpp:477
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:186
+#: src/gui/windows/charcreatedialog.cpp:196
 msgid "Race:"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:196
+#: src/gui/windows/charcreatedialog.cpp:206
 msgid "Look:"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:360
+#: src/gui/windows/charcreatedialog.cpp:370
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:457
+#: src/gui/windows/charcreatedialog.cpp:467
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:473
+#: src/gui/windows/charcreatedialog.cpp:483
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
@@ -5680,7 +5674,7 @@ msgstr ""
 #. TRANSLATORS: updater window button
 #: src/gui/windows/charselectdialog.cpp:74
 #: src/gui/windows/charselectdialog.cpp:557
-#: src/gui/windows/updaterwindow.cpp:193
+#: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "開始"
 
@@ -5857,11 +5851,38 @@ msgstr ""
 msgid "Fonts"
 msgstr ""
 
+#. TRANSLATORS: equipment window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:180 src/resources/itemtypemapdata.h:47
+#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
+#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
+#: src/resources/itemtypemapdata.h:67 src/resources/itemtypemapdata.h:71
+#: src/resources/itemtypemapdata.h:75 src/resources/itemtypemapdata.h:79
+#: src/resources/itemtypemapdata.h:83 src/resources/itemtypemapdata.h:87
+#: src/resources/itemtypemapdata.h:91 src/resources/itemtypemapdata.h:95
+msgid "Unequip"
+msgstr "卸下裝備"
+
 #. TRANSLATORS: help window. button.
 #: src/gui/windows/helpwindow.cpp:55
 msgid "Did you know..."
 msgstr ""
 
+#. TRANSLATORS: inventory button
+#. TRANSLATORS: outfits window button
+#. TRANSLATORS: inventory button
+#: src/gui/windows/inventorywindow.cpp:176 src/gui/windows/outfitwindow.cpp:63
+#: src/resources/itemtypemapdata.h:47 src/resources/itemtypemapdata.h:51
+#: src/resources/itemtypemapdata.h:55 src/resources/itemtypemapdata.h:59
+#: src/resources/itemtypemapdata.h:63 src/resources/itemtypemapdata.h:67
+#: src/resources/itemtypemapdata.h:71 src/resources/itemtypemapdata.h:75
+#: src/resources/itemtypemapdata.h:79 src/resources/itemtypemapdata.h:83
+#: src/resources/itemtypemapdata.h:87 src/resources/itemtypemapdata.h:91
+#: src/resources/itemtypemapdata.h:95
+msgid "Equip"
+msgstr "裝備"
+
 #. TRANSLATORS: item amount window button
 #: src/gui/windows/itemamountwindow.cpp:168
 msgid "All"
@@ -6047,17 +6068,17 @@ msgid "Custom update host"
 msgstr ""
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:102
+#: src/gui/windows/logindialog.cpp:103
 msgid "Server:"
 msgstr "伺服器："
 
 #. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:113
 #, c-format
 msgid "Update host: %s"
 msgstr ""
 
-#: src/gui/windows/logindialog.cpp:225
+#: src/gui/windows/logindialog.cpp:232
 msgid "Open register url"
 msgstr ""
 
@@ -6650,12 +6671,12 @@ msgid "You give:"
 msgstr "你付出:"
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:394
+#: src/gui/windows/tradewindow.cpp:397
 msgid "You don't have enough money."
 msgstr "你沒有足夠的金錢."
 
 #. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:480
+#: src/gui/windows/tradewindow.cpp:483
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
@@ -6667,36 +6688,36 @@ msgid "Name: %s"
 msgstr "名字：%s"
 
 #. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:172
+#: src/gui/windows/updaterwindow.cpp:174
 msgid "Updating..."
 msgstr "更新中..."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:189
+#: src/gui/windows/updaterwindow.cpp:191
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/windows/updaterwindow.cpp:396
+#: src/gui/windows/updaterwindow.cpp:398
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:820
+#: src/gui/windows/updaterwindow.cpp:824
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:822
+#: src/gui/windows/updaterwindow.cpp:826
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:828
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1001
+#: src/gui/windows/updaterwindow.cpp:1005
 msgid "Completed"
 msgstr "已完成"
 
@@ -6959,7 +6980,7 @@ msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:280
+#: src/net/ea/charserverhandler.cpp:180 src/net/ea/loginhandler.cpp:281
 msgid "Wrong name."
 msgstr ""
 
@@ -7132,43 +7153,43 @@ msgid "New password too short."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:292
+#: src/net/ea/loginhandler.cpp:165 src/net/ea/loginhandler.cpp:293
 msgid "Unknown error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:239
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:247
+#: src/net/ea/loginhandler.cpp:248
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:252
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:255
+#: src/net/ea/loginhandler.cpp:256
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:260
+#: src/net/ea/loginhandler.cpp:261
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:264
+#: src/net/ea/loginhandler.cpp:265
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -7176,22 +7197,22 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:272
+#: src/net/ea/loginhandler.cpp:273
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:276
+#: src/net/ea/loginhandler.cpp:277
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:284
+#: src/net/ea/loginhandler.cpp:285
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:288
+#: src/net/ea/loginhandler.cpp:289
 msgid "Username permanently erased."
 msgstr ""
 
@@ -7365,125 +7386,125 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:142
+#: src/net/eathena/generalhandler.cpp:130 src/net/tmwa/generalhandler.cpp:142
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:146
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:146
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:152
+#: src/net/eathena/generalhandler.cpp:138 src/net/tmwa/generalhandler.cpp:152
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:142 src/net/tmwa/generalhandler.cpp:158
+#: src/net/eathena/generalhandler.cpp:143 src/net/tmwa/generalhandler.cpp:158
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:146 src/net/tmwa/generalhandler.cpp:163
+#: src/net/eathena/generalhandler.cpp:147 src/net/tmwa/generalhandler.cpp:163
 msgid "Speed hack detected."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:149 src/net/tmwa/generalhandler.cpp:167
+#: src/net/eathena/generalhandler.cpp:150 src/net/tmwa/generalhandler.cpp:167
 msgid "Duplicated login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:153 src/net/tmwa/generalhandler.cpp:171
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:224 src/net/tmwa/generalhandler.cpp:253
+#: src/net/eathena/generalhandler.cpp:225 src/net/tmwa/generalhandler.cpp:253
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:281
+#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:281
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:283
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:283
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:285
 msgid "Vitality"
 msgstr "體力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:252 src/net/tmwa/generalhandler.cpp:287
+#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:287
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:253 src/net/tmwa/generalhandler.cpp:289
+#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:289
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:254 src/net/tmwa/generalhandler.cpp:291
+#: src/net/eathena/generalhandler.cpp:255 src/net/tmwa/generalhandler.cpp:291
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:296
+#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:296
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:258 src/net/tmwa/generalhandler.cpp:298
+#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:298
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:259 src/net/tmwa/generalhandler.cpp:300
+#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:300
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:261 src/net/tmwa/generalhandler.cpp:303
+#: src/net/eathena/generalhandler.cpp:262 src/net/tmwa/generalhandler.cpp:303
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:263 src/net/tmwa/generalhandler.cpp:306
+#: src/net/eathena/generalhandler.cpp:264 src/net/tmwa/generalhandler.cpp:306
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:265 src/net/tmwa/generalhandler.cpp:309
+#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:309
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:266 src/net/tmwa/generalhandler.cpp:311
+#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:311
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:267 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:313
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:268 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:315
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:269 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:270 src/net/tmwa/generalhandler.cpp:317
 msgid "Damage per sec."
 msgstr ""
 
@@ -7539,43 +7560,85 @@ msgstr ""
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
 #: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:88
-#: src/resources/db/itemdb.cpp:350 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
 #: src/resources/db/monsterdb.cpp:106 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知物品"
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:96
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:98
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:98
+#. TRANSLATORS: item info label (attack)
+#: src/resources/db/itemdb.cpp:100
+#, c-format
+msgid "Critical attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic attack)
+#: src/resources/db/itemdb.cpp:102
+#, c-format
+msgid "M. Attack %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:104
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:100
+#. TRANSLATORS: item info label (defence)
+#: src/resources/db/itemdb.cpp:106
+#, c-format
+msgid "Critical defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (magic defence)
+#: src/resources/db/itemdb.cpp:108
+#, c-format
+msgid "M. Defense %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:110
 #, c-format
 msgid "HP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:102
+#. TRANSLATORS: item info label (mana)
+#: src/resources/db/itemdb.cpp:112
 #, c-format
 msgid "MP %s"
 msgstr ""
 
-#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:104
+#. TRANSLATORS: item info label (level)
+#: src/resources/db/itemdb.cpp:114
 #, c-format
 msgid "Level %s"
 msgstr ""
 
+#. TRANSLATORS: item info label (moving speed)
+#: src/resources/db/itemdb.cpp:116
+#, c-format
+msgid "Speed %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:118
+#, c-format
+msgid "Range %s"
+msgstr ""
+
+#. TRANSLATORS: item info label (health)
+#: src/resources/db/itemdb.cpp:120
+#, c-format
+msgid "Flee %s"
+msgstr ""
+
 #. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:228
+#: src/resources/db/itemdb.cpp:210
 msgid "Unknown item"
 msgstr "不明的物品"