Update translations.

1 files changed, 239 insertions, 176 deletions

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 "不明的物品"