Update translations.

1 files changed, 247 insertions, 241 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3bc0e11b9..a9d9dca40 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-04 16:11+0300\n"
-"PO-Revision-Date: 2015-12-15 09:08+0000\n"
+"POT-Creation-Date: 2016-01-08 23:18+0300\n"
+"PO-Revision-Date: 2016-01-05 09:13+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -50,7 +50,7 @@ msgstr "檔案上載成功"
 #: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
 #: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:67
 #: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:525
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
@@ -62,43 +62,43 @@ msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1040 src/actions/actions.cpp:1053
+#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
 msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1195 src/actions/actions.cpp:1201
+#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1258 src/actions/actions.cpp:1267
+#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1261 src/actions/actions.cpp:1271
+#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1362
+#: src/actions/actions.cpp:1363
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1475
+#: src/actions/actions.cpp:1476
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1485
+#: src/actions/actions.cpp:1486
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1495
+#: src/actions/actions.cpp:1496
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
@@ -129,7 +129,7 @@ msgstr "欠缺公會名稱."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:89
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:132
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已經 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:145
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:147
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能被 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:182
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "玩家沒有被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:191
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:193
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "玩家已經擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:221
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "玩家不再被擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:223
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "玩家不能被擦去!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:230
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:237
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "被忽略"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:244
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:251
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "被列入黑名單"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:258
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "冤家"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:537
+#: src/actions/commands.cpp:538
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1038
+#: src/actions/commands.cpp:1039
 #, c-format
 msgid "Config value: %s"
 msgstr "配置數值:%s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1051
+#: src/actions/commands.cpp:1052
 #, c-format
 msgid "Server config value: %s"
 msgstr "伺服器配置數值:%s"
@@ -415,8 +415,8 @@ msgstr "你看到 %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2361
-#: src/gui/popups/popupmenu.cpp:2403
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2364
+#: src/gui/popups/popupmenu.cpp:2406
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -501,12 +501,12 @@ msgstr "說明"
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:679 src/gui/popups/popupmenu.cpp:756
-#: src/gui/popups/popupmenu.cpp:997 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:269
-#: src/gui/windows/inventorywindow.cpp:293
+#: src/gui/popups/popupmenu.cpp:998 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:82 src/gui/windows/npcdialog.cpp:124
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:113
+#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -1210,7 +1210,7 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2693
 msgid "Revive"
 msgstr "復活"
 
@@ -1394,8 +1394,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2033
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2036
+#: src/gui/popups/popupmenu.cpp:2114 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1725,22 +1725,22 @@ msgstr "選擇隊伍"
 #: src/gui/popups/popupmenu.cpp:608 src/gui/popups/popupmenu.cpp:643
 #: src/gui/popups/popupmenu.cpp:684 src/gui/popups/popupmenu.cpp:709
 #: src/gui/popups/popupmenu.cpp:734 src/gui/popups/popupmenu.cpp:923
-#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:983
-#: src/gui/popups/popupmenu.cpp:1771 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1859 src/gui/popups/popupmenu.cpp:1901
-#: src/gui/popups/popupmenu.cpp:1942 src/gui/popups/popupmenu.cpp:2012
-#: src/gui/popups/popupmenu.cpp:2090 src/gui/popups/popupmenu.cpp:2124
-#: src/gui/popups/popupmenu.cpp:2151 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2193 src/gui/popups/popupmenu.cpp:2219
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2265
-#: src/gui/popups/popupmenu.cpp:2581 src/gui/popups/popupmenu.cpp:2746
+#: src/gui/popups/popupmenu.cpp:950 src/gui/popups/popupmenu.cpp:984
+#: src/gui/popups/popupmenu.cpp:1773 src/gui/popups/popupmenu.cpp:1810
+#: src/gui/popups/popupmenu.cpp:1862 src/gui/popups/popupmenu.cpp:1904
+#: src/gui/popups/popupmenu.cpp:1945 src/gui/popups/popupmenu.cpp:2015
+#: src/gui/popups/popupmenu.cpp:2093 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2154 src/gui/popups/popupmenu.cpp:2175
+#: src/gui/popups/popupmenu.cpp:2196 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2240 src/gui/popups/popupmenu.cpp:2268
+#: src/gui/popups/popupmenu.cpp:2584 src/gui/popups/popupmenu.cpp:2750
 #: src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:58
-#: src/gui/windows/itemamountwindow.cpp:181 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
 #: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:100
 #: src/gui/windows/textcommandeditor.cpp:95 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:55
@@ -1770,7 +1770,8 @@ msgstr "卡片： "
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
 #: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:829
-#: src/gui/widgets/tabs/chat/tradetab.cpp:39 src/inventory.cpp:337
+#: src/gui/widgets/tabs/chat/tradetab.cpp:39
+#: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
 msgstr "交易"
 
@@ -1873,10 +1874,10 @@ msgstr "對話"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2436
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
-#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:169
+#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
 #: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:154
 msgid "Buy"
 msgstr "購買"
@@ -1891,10 +1892,10 @@ msgstr "購買"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2445
+#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2448
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
 #: src/resources/db/npcdb.cpp:156
 msgid "Sell"
 msgstr "出售"
@@ -1904,7 +1905,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2543
+#: src/gui/popups/popupmenu.cpp:2546
 msgid "Add comment"
 msgstr "添加評論"
 
@@ -1930,7 +1931,7 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2563
+#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2566
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
@@ -1971,7 +1972,7 @@ msgstr "丟棄"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:204 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1988,7 +1989,7 @@ msgstr "卸下裝備"
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:628
-#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:193
+#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重新命名"
 
@@ -2014,8 +2015,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2510
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2489
+#: src/gui/popups/popupmenu.cpp:2513
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
@@ -2027,8 +2028,8 @@ msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1767
-#: src/gui/popups/popupmenu.cpp:1845 src/gui/popups/popupmenu.cpp:1887
+#: src/gui/popups/popupmenu.cpp:604 src/gui/popups/popupmenu.cpp:1769
+#: src/gui/popups/popupmenu.cpp:1848 src/gui/popups/popupmenu.cpp:1890
 msgid "Add to chat"
 msgstr "加至對話"
 
@@ -2043,8 +2044,8 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2086
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:631 src/gui/popups/popupmenu.cpp:2089
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Remove"
 msgstr "清除"
 
@@ -2068,8 +2069,8 @@ msgstr "移動鏡頭"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:698 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:233
-#: src/gui/windows/outfitwindow.cpp:59
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
 msgstr "裝備"
 
@@ -2094,7 +2095,7 @@ msgstr "編輯咒語"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:121
+#: src/gui/popups/popupmenu.cpp:761 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
@@ -2147,8 +2148,8 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2189
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:810 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2236
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
@@ -2158,73 +2159,73 @@ msgid "Change guild position"
 msgstr "改變公會職位"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:977
+#: src/gui/popups/popupmenu.cpp:978
 msgid "window"
 msgstr "視窗"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1006
+#: src/gui/popups/popupmenu.cpp:1007
 msgid "Unlock"
 msgstr "解鎖"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1013
 msgid "Lock"
 msgstr "鎖定"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1063
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1065
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Name:                    "
 msgstr "名字:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1084
+#: src/gui/popups/popupmenu.cpp:1085
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1087
+#: src/gui/popups/popupmenu.cpp:1088
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1660
+#: src/gui/popups/popupmenu.cpp:1661
 msgid "Add to trade"
 msgstr "加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1668
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1673
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1677
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1681
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2233,66 +2234,66 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/popups/popupmenu.cpp:1841
-#: src/gui/popups/popupmenu.cpp:1882 src/gui/windows/inventorywindow.cpp:264
-#: src/gui/windows/inventorywindow.cpp:288
-#: src/gui/windows/inventorywindow.cpp:894 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1690 src/gui/popups/popupmenu.cpp:1844
+#: src/gui/popups/popupmenu.cpp:1885 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
+#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "儲存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1697
+#: src/gui/popups/popupmenu.cpp:1698
 msgid "Store 10"
 msgstr "儲存 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1702
+#: src/gui/popups/popupmenu.cpp:1703
 msgid "Store half"
 msgstr "儲存 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1706
+#: src/gui/popups/popupmenu.cpp:1707
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1710
+#: src/gui/popups/popupmenu.cpp:1711
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1720 src/gui/windows/inventorywindow.cpp:266
-#: src/gui/windows/inventorywindow.cpp:290
+#: src/gui/popups/popupmenu.cpp:1721 src/gui/windows/inventorywindow.cpp:267
+#: src/gui/windows/inventorywindow.cpp:291
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1729
 msgid "Retrieve 10"
 msgstr "取回 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1733
+#: src/gui/popups/popupmenu.cpp:1734
 msgid "Retrieve half"
 msgstr "取回 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1738
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1741
+#: src/gui/popups/popupmenu.cpp:1742
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2303,9 +2304,9 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1802 src/gui/popups/popupmenu.cpp:2632
-#: src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/skilldialog.cpp:90
+#: src/gui/popups/popupmenu.cpp:1804 src/gui/popups/popupmenu.cpp:2636
+#: src/gui/windows/inventorywindow.cpp:203
+#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2313,46 +2314,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1897
+#: src/gui/popups/popupmenu.cpp:1900
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1928 src/gui/popups/popupmenu.cpp:1989
+#: src/gui/popups/popupmenu.cpp:1931 src/gui/popups/popupmenu.cpp:1992
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1935 src/gui/popups/popupmenu.cpp:1996
+#: src/gui/popups/popupmenu.cpp:1938 src/gui/popups/popupmenu.cpp:1999
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2003
+#: src/gui/popups/popupmenu.cpp:2006
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2005
+#: src/gui/popups/popupmenu.cpp:2008
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2009 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:2012 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "複製至對話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2049 src/gui/popups/popupmenu.cpp:2068
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2071
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2055 src/gui/popups/popupmenu.cpp:2074
+#: src/gui/popups/popupmenu.cpp:2058 src/gui/popups/popupmenu.cpp:2077
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2360,30 +2361,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2147 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2150 src/gui/popups/popupmenu.cpp:2543
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2165
+#: src/gui/popups/popupmenu.cpp:2168
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2168
+#: src/gui/popups/popupmenu.cpp:2171
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2189
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2204
+#: src/gui/popups/popupmenu.cpp:2207
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2391,8 +2392,8 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2256 src/gui/popups/skillpopup.cpp:127
-#: src/gui/windows/ministatuswindow.cpp:359 src/gui/windows/statuswindow.cpp:67
+#: src/gui/popups/popupmenu.cpp:2259 src/gui/popups/skillpopup.cpp:127
+#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
 msgid "Level: %d"
@@ -2400,134 +2401,134 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2261
+#: src/gui/popups/popupmenu.cpp:2264
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2307 src/gui/popups/popupmenu.cpp:2343
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2385 src/gui/popups/popupmenu.cpp:2403
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2310 src/gui/popups/popupmenu.cpp:2346
-#: src/gui/popups/popupmenu.cpp:2385 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2388 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2313 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2391
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2316 src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2352
-#: src/gui/popups/popupmenu.cpp:2364 src/gui/popups/popupmenu.cpp:2373
-#: src/gui/popups/popupmenu.cpp:2391
+#: src/gui/popups/popupmenu.cpp:2322 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2367 src/gui/popups/popupmenu.cpp:2376
+#: src/gui/popups/popupmenu.cpp:2394
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2329
+#: src/gui/popups/popupmenu.cpp:2332
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/popups/popupmenu.cpp:2358
-#: src/gui/popups/popupmenu.cpp:2370 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2397
+#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2361
+#: src/gui/popups/popupmenu.cpp:2373 src/gui/popups/popupmenu.cpp:2382
+#: src/gui/popups/popupmenu.cpp:2400
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2419
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2423
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2439 src/gui/popups/popupmenu.cpp:2463
+#: src/gui/popups/popupmenu.cpp:2442 src/gui/popups/popupmenu.cpp:2466
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2451 src/gui/popups/popupmenu.cpp:2466
+#: src/gui/popups/popupmenu.cpp:2454 src/gui/popups/popupmenu.cpp:2469
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2504
+#: src/gui/popups/popupmenu.cpp:2483 src/gui/popups/popupmenu.cpp:2507
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2528
+#: src/gui/popups/popupmenu.cpp:2531
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2537
+#: src/gui/popups/popupmenu.cpp:2540
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2554
+#: src/gui/popups/popupmenu.cpp:2557
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/gui/popups/popupmenu.cpp:2562
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2608
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2617
+#: src/gui/popups/popupmenu.cpp:2621
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2647 src/gui/windows/inventorywindow.cpp:217
-#: src/gui/windows/inventorywindow.cpp:902
+#: src/gui/popups/popupmenu.cpp:2651 src/gui/windows/inventorywindow.cpp:218
+#: src/gui/windows/inventorywindow.cpp:906
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2650
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2535,60 +2536,60 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2656 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:907
+#: src/gui/popups/popupmenu.cpp:2660 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:911
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:2671
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2675
+#: src/gui/popups/popupmenu.cpp:2679
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2680
+#: src/gui/popups/popupmenu.cpp:2684
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2683
+#: src/gui/popups/popupmenu.cpp:2687
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2686
+#: src/gui/popups/popupmenu.cpp:2690
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2694
+#: src/gui/popups/popupmenu.cpp:2698
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2702 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2710 src/gui/popups/popupmenu.cpp:2714
-#: src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2706 src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2714 src/gui/popups/popupmenu.cpp:2718
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2727
-#: src/gui/popups/popupmenu.cpp:2731 src/gui/popups/popupmenu.cpp:2735
-#: src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2727 src/gui/popups/popupmenu.cpp:2731
+#: src/gui/popups/popupmenu.cpp:2735 src/gui/popups/popupmenu.cpp:2739
+#: src/gui/popups/popupmenu.cpp:2743
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
@@ -2936,14 +2937,14 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:697 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:361 src/gui/widgets/itemcontainer.cpp:483
+#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
 msgid "Eq."
 msgstr ""
 
@@ -2959,8 +2960,8 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:125
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "增加"
@@ -2986,8 +2987,8 @@ msgstr "離開"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
-#: src/gui/windows/itemamountwindow.cpp:177
-#: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:117
+#: src/gui/windows/itemamountwindow.cpp:190
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -2998,8 +2999,8 @@ msgstr ""
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
-#: src/gui/windows/itemamountwindow.cpp:175
-#: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:188
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
 msgid "-"
 msgstr ""
 
@@ -4490,7 +4491,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:237
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Shop"
 msgstr "商店"
 
@@ -4506,7 +4507,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:93
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
 msgid "NPC"
 msgstr "NPC"
 
@@ -4933,7 +4934,7 @@ msgstr "允許密語"
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:78
 #: src/gui/windows/charselectdialog.cpp:78 src/gui/windows/mailwindow.cpp:66
-#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:121 src/gui/windows/shopwindow.cpp:128
 #: src/gui/windows/textcommandeditor.cpp:99 src/input/pages/gui.cpp:109
 msgid "Delete"
 msgstr "刪除"
@@ -5594,7 +5595,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:239
+#: src/gui/windows/inventorywindow.cpp:240
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5606,8 +5607,8 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:148
-#: src/inventory.cpp:310
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/resources/inventory/inventory.cpp:310
 msgid "Inventory"
 msgstr "背包"
 
@@ -5619,8 +5620,8 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:235
-#: src/inventory.cpp:326
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/resources/inventory/inventory.cpp:326
 msgid "Cart"
 msgstr ""
 
@@ -5716,7 +5717,7 @@ msgstr ""
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
 #: src/gui/windowmenu.cpp:170 src/gui/windows/mailwindow.cpp:52
-#: src/inventory.cpp:331
+#: src/resources/inventory/inventory.cpp:331
 msgid "Mail"
 msgstr ""
 
@@ -5737,8 +5738,8 @@ msgstr ""
 
 #. TRANSLATORS: short key name
 #. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:76
-#: src/gui/windows/outfitwindow.cpp:628
+#: src/gui/windowmenu.cpp:322 src/gui/windows/outfitwindow.cpp:77
+#: src/gui/windows/outfitwindow.cpp:629
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -5887,7 +5888,7 @@ msgstr "名字:"
 #: src/gui/windows/charcreatedialog.cpp:95
 #: src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -5898,7 +5899,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:90
 #: src/gui/windows/charcreatedialog.cpp:97
 #: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -5951,7 +5952,7 @@ msgstr ""
 #. TRANSLATORS: inventory outfits button
 #: src/gui/windows/charcreatedialog.cpp:237
 #: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:219
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "O"
 msgstr ""
 
@@ -6227,7 +6228,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:200 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6239,88 +6240,88 @@ msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:223
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:225
+#: src/gui/windows/inventorywindow.cpp:226
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1043
+#: src/gui/windows/inventorywindow.cpp:1047
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1045
+#: src/gui/windows/inventorywindow.cpp:1049
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
 
 #. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:183
+#: src/gui/windows/itemamountwindow.cpp:196
 msgid "All"
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:239
+#: src/gui/windows/itemamountwindow.cpp:252
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:243
+#: src/gui/windows/itemamountwindow.cpp:256
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:247
+#: src/gui/windows/itemamountwindow.cpp:260
 msgid "Select amount of items to store."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:252
+#: src/gui/windows/itemamountwindow.cpp:265
 msgid "Select amount of items to send."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:257
+#: src/gui/windows/itemamountwindow.cpp:270
 msgid "Select amount of items to store to cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:261
+#: src/gui/windows/itemamountwindow.cpp:274
 msgid "Select amount of items to retrieve."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:265
+#: src/gui/windows/itemamountwindow.cpp:278
 msgid "Select amount of items to retrieve from cart."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:269
+#: src/gui/windows/itemamountwindow.cpp:282
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量."
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:273
+#: src/gui/windows/itemamountwindow.cpp:286
 msgid "Add to buy shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:277
+#: src/gui/windows/itemamountwindow.cpp:290
 msgid "Add to sell shop."
 msgstr ""
 
 #. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:281
+#: src/gui/windows/itemamountwindow.cpp:294
 msgid "Unknown."
 msgstr ""
 
@@ -6553,87 +6554,87 @@ msgid "Open"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:71
+#: src/gui/windows/ministatuswindow.cpp:72
 msgid "health bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:81
+#: src/gui/windows/ministatuswindow.cpp:82
 msgid "mana bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:86
+#: src/gui/windows/ministatuswindow.cpp:87
 msgid "experience bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:92
+#: src/gui/windows/ministatuswindow.cpp:93
 msgid "weight bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:98
+#: src/gui/windows/ministatuswindow.cpp:99
 msgid "inventory slots bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:103
+#: src/gui/windows/ministatuswindow.cpp:104
 msgid "money bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:108
+#: src/gui/windows/ministatuswindow.cpp:109
 msgid "arrows bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:114
+#: src/gui/windows/ministatuswindow.cpp:115
 msgid "status bar"
 msgstr ""
 
 #. TRANSLATORS: status bar name
-#: src/gui/windows/ministatuswindow.cpp:137
+#: src/gui/windows/ministatuswindow.cpp:138
 msgid "job bar"
 msgstr ""
 
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/windows/ministatuswindow.cpp:352
+#: src/gui/windows/ministatuswindow.cpp:353
 #: src/gui/windows/statuswindow.cpp:235
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
 #. TRANSLATORS: status bar label
-#: src/gui/windows/ministatuswindow.cpp:375
-#: src/gui/windows/ministatuswindow.cpp:412
+#: src/gui/windows/ministatuswindow.cpp:376
+#: src/gui/windows/ministatuswindow.cpp:413
 msgid "Need"
 msgstr ""
 
 #. TRANSLATORS: job bar label
-#: src/gui/windows/ministatuswindow.cpp:399
+#: src/gui/windows/ministatuswindow.cpp:400
 #, c-format
 msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:78
+#: src/gui/windows/npcdialog.cpp:80
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:82
 msgid "Next"
 msgstr "繼續"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:84
+#: src/gui/windows/npcdialog.cpp:86
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/npcdialog.cpp:130
 msgid "Reset"
 msgstr ""
 
@@ -6649,18 +6650,18 @@ msgid "Do you really want to sell %s?"
 msgstr ""
 
 #. TRANSLATORS: outfits window label
-#: src/gui/windows/outfitwindow.cpp:68 src/gui/windows/outfitwindow.cpp:622
+#: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:70
+#: src/gui/windows/outfitwindow.cpp:71
 msgid "Unequip first"
 msgstr ""
 
 #. TRANSLATORS: outfits window checkbox
-#: src/gui/windows/outfitwindow.cpp:73
+#: src/gui/windows/outfitwindow.cpp:74
 msgid "Away outfit"
 msgstr ""
 
@@ -6801,72 +6802,72 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:1120
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
 msgid "Personal Shop"
 msgstr ""
 
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:191 src/gui/windows/shopwindow.cpp:440
-#: src/gui/windows/shopwindow.cpp:465
+#: src/gui/windows/shopwindow.cpp:192 src/gui/windows/shopwindow.cpp:441
+#: src/gui/windows/shopwindow.cpp:466
 msgid "Publish"
 msgstr ""
 
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:200
+#: src/gui/windows/shopwindow.cpp:201
 msgid "Announce"
 msgstr ""
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:202
+#: src/gui/windows/shopwindow.cpp:203
 msgid "Show links in announce"
 msgstr ""
 
 #. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:374
+#: src/gui/windows/shopwindow.cpp:375
 msgid "Please enter new shop name"
 msgstr ""
 
 #. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:435 src/gui/windows/shopwindow.cpp:460
+#: src/gui/windows/shopwindow.cpp:436 src/gui/windows/shopwindow.cpp:461
 msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:916
+#: src/gui/windows/shopwindow.cpp:917
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:958
+#: src/gui/windows/shopwindow.cpp:959
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:970
+#: src/gui/windows/shopwindow.cpp:971
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:990
+#: src/gui/windows/shopwindow.cpp:991
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:997
+#: src/gui/windows/shopwindow.cpp:998
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1004 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1125
+#: src/gui/windows/shopwindow.cpp:1126
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -8421,16 +8422,6 @@ msgstr ""
 msgid "Clear drops window"
 msgstr ""
 
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:315
-msgid "Storage"
-msgstr ""
-
-#. TRANSLATORS: inventory type name
-#: src/inventory.cpp:320
-msgid "Npc"
-msgstr ""
-
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -9028,9 +9019,9 @@ msgstr ""
 
 #. TRANSLATORS: pet hungry level
 #: src/net/eathena/petrecv.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "hungry level %d"
-msgstr "飢餓：%d"
+msgstr ""
 
 #. TRANSLATORS: skill error message
 #: src/net/eathena/skillrecv.cpp:229
@@ -9426,6 +9417,21 @@ msgstr ""
 msgid "skill"
 msgstr ""
 
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:315
+msgid "Storage"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:320
+msgid "Npc"
+msgstr ""
+
+#. TRANSLATORS: inventory type name
+#: src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:38
 msgid "Thanks for buying."