summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-29 16:40:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-29 16:40:03 +0300
commitb4658b5317715e13f4294e5a8c60e20af8db0744 (patch)
tree802f2f7d60be896fd41d298e1b358529936c612f /po/zh_CN.po
parent05174b5178b28df4883f593f8105c74fa47bb8f4 (diff)
downloadplus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.gz
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.bz2
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.tar.xz
plus-b4658b5317715e13f4294e5a8c60e20af8db0744.zip
Update translations.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po674
1 files changed, 352 insertions, 322 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5e4c679a0..0f402e69d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-20 22:17+0300\n"
+"POT-Creation-Date: 2016-01-29 16:32+0300\n"
"PO-Revision-Date: 2016-01-17 09:15+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -42,7 +42,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
-#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
#: src/gui/widgets/tabs/setup_theme.cpp:314
#: src/gui/widgets/tabs/setup_theme.cpp:350
#: src/gui/widgets/tabs/setup_video.cpp:253
@@ -51,7 +51,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_video.cpp:416
#: src/gui/windows/changeemaildialog.cpp:169
#: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:428
+#: src/gui/windows/charcreatedialog.cpp:466
#: src/gui/windows/charselectdialog.cpp:260
#: src/gui/windows/charselectdialog.cpp:308 src/gui/windows/editdialog.cpp:50
#: src/gui/windows/editserverdialog.cpp:56
@@ -73,38 +73,38 @@ msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1196 src/actions/actions.cpp:1202
+#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1259 src/actions/actions.cpp:1268
+#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1262 src/actions/actions.cpp:1272
+#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
msgid "Resource orphaned images:"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1363
+#: src/actions/actions.cpp:1378
msgid "Environment variables dumped"
msgstr ""
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1476
+#: src/actions/actions.cpp:1491
msgid "Uploaded config into:"
msgstr ""
#. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1486
+#: src/actions/actions.cpp:1501
msgid "Uploaded server config into:"
msgstr ""
#. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1496
+#: src/actions/actions.cpp:1511
msgid "Uploaded log into:"
msgstr ""
@@ -135,7 +135,7 @@ msgstr "公会名称缺失."
#. TRANSLATORS: party kick message
#. TRANSLATORS: change relation
#: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
msgid "Please specify a name."
msgstr "请指定一个名称."
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:133
+#: src/actions/commands.cpp:137
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:146
+#: src/actions/commands.cpp:150
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:148
+#: src/actions/commands.cpp:152
#, c-format
msgid "Player could not be %s!"
msgstr "玩家不能为 %s!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:183
+#: src/actions/commands.cpp:187
msgid "Player wasn't ignored!"
msgstr "玩家没有被忽视!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:196
msgid "Player no longer ignored!"
msgstr "玩家不再被忽视!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:198
msgid "Player could not be unignored!"
msgstr "不能取消对玩家的忽视!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:209
+#: src/actions/commands.cpp:213
msgid "Player already erased!"
msgstr "玩家已经被删除!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:226
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:224
+#: src/actions/commands.cpp:228
msgid "Player could not be erased!"
msgstr "无法删除玩家!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:231
+#: src/actions/commands.cpp:235
msgid "friend"
msgstr "朋友"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:238
+#: src/actions/commands.cpp:242
msgid "disregarded"
msgstr "无视"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:245
+#: src/actions/commands.cpp:249
msgid "neutral"
msgstr "中立"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:252
+#: src/actions/commands.cpp:256
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:259
+#: src/actions/commands.cpp:263
msgid "enemy"
msgstr ""
#. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:538
+#: src/actions/commands.cpp:542
msgid "Quick message"
msgstr ""
#. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1039
+#: src/actions/commands.cpp:1056
#, c-format
msgid "Config value: %s"
msgstr ""
#. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1052
+#: src/actions/commands.cpp:1069
#, c-format
msgid "Server config value: %s"
msgstr ""
@@ -421,8 +421,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2397
-#: src/gui/popups/popupmenu.cpp:2439
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
msgid "Completely ignore"
msgstr "完全忽略"
@@ -506,13 +506,13 @@ msgstr "帮助"
#. TRANSLATORS: shop window button
#: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
#: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:681 src/gui/popups/popupmenu.cpp:758
-#: src/gui/popups/popupmenu.cpp:1002 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
+#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/windows/inventorywindow.cpp:273
+#: src/gui/windows/inventorywindow.cpp:297
#: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
-#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
msgid "Close"
msgstr "关闭"
@@ -562,7 +562,7 @@ msgstr "正在更改游戏服务器"
#: src/client.cpp:1417 src/client.cpp:1436 src/client.cpp:1669
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:424
+#: src/gui/windows/charcreatedialog.cpp:462
#: src/gui/windows/charselectdialog.cpp:304
#: src/gui/windows/editserverdialog.cpp:211
#: src/gui/windows/registerdialog.cpp:256
@@ -1216,7 +1216,7 @@ msgstr "讯息"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2728
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
msgid "Revive"
msgstr ""
@@ -1400,8 +1400,8 @@ msgstr ""
#. TRANSLATORS: language
#. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2065
-#: src/gui/popups/popupmenu.cpp:2143 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
msgid "(default)"
msgstr "(默认)"
@@ -1726,24 +1726,24 @@ msgstr "建立"
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:392
-#: src/gui/popups/popupmenu.cpp:460 src/gui/popups/popupmenu.cpp:561
-#: src/gui/popups/popupmenu.cpp:610 src/gui/popups/popupmenu.cpp:645
-#: src/gui/popups/popupmenu.cpp:686 src/gui/popups/popupmenu.cpp:711
-#: src/gui/popups/popupmenu.cpp:736 src/gui/popups/popupmenu.cpp:925
-#: src/gui/popups/popupmenu.cpp:952 src/gui/popups/popupmenu.cpp:988
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1833
-#: src/gui/popups/popupmenu.cpp:1889 src/gui/popups/popupmenu.cpp:1933
-#: src/gui/popups/popupmenu.cpp:1974 src/gui/popups/popupmenu.cpp:2044
-#: src/gui/popups/popupmenu.cpp:2122 src/gui/popups/popupmenu.cpp:2156
-#: src/gui/popups/popupmenu.cpp:2185 src/gui/popups/popupmenu.cpp:2206
-#: src/gui/popups/popupmenu.cpp:2227 src/gui/popups/popupmenu.cpp:2253
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2617 src/gui/popups/popupmenu.cpp:2785
-#: src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
+#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
+#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
+#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
+#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
+#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
+#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1810 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
#: src/gui/windows/changeemaildialog.cpp:56
#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:122
+#: src/gui/windows/charcreatedialog.cpp:112
#: src/gui/windows/connectiondialog.cpp:52
#: src/gui/windows/editserverdialog.cpp:58
#: src/gui/windows/itemamountwindow.cpp:194 src/gui/windows/quitdialog.cpp:69
@@ -1775,7 +1775,7 @@ msgstr ""
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
#. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:166 src/gui/popups/popupmenu.cpp:831
+#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
#: src/gui/widgets/tabs/chat/tradetab.cpp:39
#: src/resources/inventory/inventory.cpp:342
msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "交易"
#. TRANSLATORS: Skill type
#. TRANSLATORS: input action name
#. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:169 src/gui/popups/popupmenu.cpp:291
-#: src/gui/popups/popupmenu.cpp:834 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
+#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
#: src/net/tmwa/generalhandler.cpp:251
msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "攻击"
#. TRANSLATORS: whisper to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:172 src/gui/popups/popupmenu.cpp:264
-#: src/gui/popups/popupmenu.cpp:481
+#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
+#: src/gui/popups/popupmenu.cpp:482
msgid "Whisper"
msgstr "密语"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:838
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
msgid "Heal"
msgstr "愈合"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:198 src/gui/popups/popupmenu.cpp:214
-#: src/gui/popups/popupmenu.cpp:530 src/gui/popups/popupmenu.cpp:866
+#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
+#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
msgid "Kick from guild"
msgstr "踢从公会"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:205 src/gui/popups/popupmenu.cpp:221
-#: src/gui/popups/popupmenu.cpp:537 src/gui/popups/popupmenu.cpp:873
+#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
+#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:234 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:887
+#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
+#: src/gui/popups/popupmenu.cpp:888
msgid "Invite to guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:241
+#: src/gui/popups/popupmenu.cpp:242
msgid "Nuke"
msgstr ""
@@ -1854,10 +1854,10 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move to player location
#. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:277
-#: src/gui/popups/popupmenu.cpp:511 src/gui/popups/popupmenu.cpp:673
-#: src/gui/popups/popupmenu.cpp:845 src/gui/popups/popupmenu.cpp:910
-#: src/gui/setupinputpages.cpp:45
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
+#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
+#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/setupinputpages.cpp:46
msgid "Move"
msgstr "移动"
@@ -1865,8 +1865,8 @@ msgstr "移动"
#. TRANSLATORS: talk with npc
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:258 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:150
+#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:151
msgid "Talk"
msgstr "说话"
@@ -1880,11 +1880,11 @@ msgstr "说话"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:268 src/gui/popups/popupmenu.cpp:2469
+#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
#: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
#: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
#: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:153
msgid "Buy"
msgstr "购买"
@@ -1898,11 +1898,11 @@ msgstr "购买"
#. TRANSLATORS: shop window tab name
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:271 src/gui/popups/popupmenu.cpp:2481
+#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
#: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
#: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
-#: src/resources/db/npcdb.cpp:154
+#: src/resources/db/npcdb.cpp:155
msgid "Sell"
msgstr "出售"
@@ -1910,26 +1910,26 @@ msgstr "出售"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:491
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
+#: src/gui/popups/popupmenu.cpp:2500
msgid "Add comment"
msgstr "发表评论"
#. TRANSLATORS: remove monster from attack list
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:303
+#: src/gui/popups/popupmenu.cpp:304
msgid "Remove from attack list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:310
+#: src/gui/popups/popupmenu.cpp:311
msgid "Add to priority attack list"
msgstr "优先攻击列表"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:314
+#: src/gui/popups/popupmenu.cpp:315
msgid "Add to attack list"
msgstr "加入攻击清单"
@@ -1937,19 +1937,19 @@ msgstr "加入攻击清单"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:318 src/gui/popups/popupmenu.cpp:2599
+#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
msgid "Add to ignore list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:339
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
msgid "Move to master"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:332
+#: src/gui/popups/popupmenu.cpp:333
msgid "Fire"
msgstr ""
@@ -1957,19 +1957,19 @@ msgstr ""
#. TRANSLATORS: feed homunculus
#. TRANSLATORS: popup menu item
#. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:342 src/gui/popups/popupmenu.cpp:355
+#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
msgid "Feed"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:346
+#: src/gui/popups/popupmenu.cpp:347
msgid "Kill"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:358
+#: src/gui/popups/popupmenu.cpp:359
msgid "Drop loot"
msgstr ""
@@ -1977,8 +1977,8 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
#: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
#: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
#: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1994,14 +1994,14 @@ msgstr "卸下装备"
#. TRANSLATORS: rename map item
#. TRANSLATORS: character rename button
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
#: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
msgid "Rename"
msgstr "重命名"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:369
+#: src/gui/popups/popupmenu.cpp:370
msgid "Return to egg"
msgstr ""
@@ -2009,38 +2009,38 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:557
+#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
msgid "Add name to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:437 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
msgid "Players"
msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2546
+#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
msgid "Kick from party"
msgstr "踢从党"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:592 src/gui/popups/popupmenu.cpp:601
+#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
msgid "Pick up"
msgstr "拾取"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1875 src/gui/popups/popupmenu.cpp:1919
+#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
+#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
msgid "Add to chat"
msgstr "加入聊天"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:627 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
msgid "Map Item"
msgstr "地图项"
@@ -2050,22 +2050,22 @@ msgstr "地图项"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:633 src/gui/popups/popupmenu.cpp:2118
-#: src/gui/popups/popupmenu.cpp:2152
+#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
#. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:640 src/gui/popups/popupmenu.cpp:669
+#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
#: src/net/eathena/skillrecv.cpp:355
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:676
+#: src/gui/popups/popupmenu.cpp:677
msgid "Move camera"
msgstr ""
@@ -2074,77 +2074,77 @@ msgstr ""
#. TRANSLATORS: long button name for outfits window.
#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:700 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
#: src/gui/windows/outfitwindow.cpp:60
msgid "Outfits"
msgstr "套装"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:703
+#: src/gui/popups/popupmenu.cpp:704
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:729 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
msgid "Spells"
msgstr "法术"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:732
+#: src/gui/popups/popupmenu.cpp:733
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:763 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
msgid "Clear"
msgstr "清除"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:770
+#: src/gui/popups/popupmenu.cpp:771
msgid "Disable highlight"
msgstr "禁用"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:776
+#: src/gui/popups/popupmenu.cpp:777
msgid "Enable highlight"
msgstr "启用突出"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:782
+#: src/gui/popups/popupmenu.cpp:783
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:788
+#: src/gui/popups/popupmenu.cpp:789
msgid "Remove name"
msgstr "移除姓名"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:794
+#: src/gui/popups/popupmenu.cpp:795
msgid "Enable away"
msgstr "启用远"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:800
+#: src/gui/popups/popupmenu.cpp:801
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:807 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
msgid "Leave"
msgstr "留下"
@@ -2154,84 +2154,84 @@ msgstr "留下"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:812 src/gui/popups/popupmenu.cpp:2223
-#: src/gui/popups/popupmenu.cpp:2267
+#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:934
+#: src/gui/popups/popupmenu.cpp:935
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:982
+#: src/gui/popups/popupmenu.cpp:983
msgid "window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1011
+#: src/gui/popups/popupmenu.cpp:1012
msgid "Unlock"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1017
+#: src/gui/popups/popupmenu.cpp:1018
msgid "Lock"
msgstr ""
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1067
+#: src/gui/popups/popupmenu.cpp:1068
msgid "Rename map sign "
msgstr "重命名的地图标志 "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1070
+#: src/gui/popups/popupmenu.cpp:1071
msgid "Name: "
msgstr "名称: "
#. TRANSLATORS: dialog caption
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1086
msgid "Player comment "
msgstr "玩家评论 "
#. TRANSLATORS: label
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1092
+#: src/gui/popups/popupmenu.cpp:1089
msgid "Comment: "
msgstr "评论: "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1682
+#: src/gui/popups/popupmenu.cpp:1589
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1690
+#: src/gui/popups/popupmenu.cpp:1597
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1695
+#: src/gui/popups/popupmenu.cpp:1602
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1699
+#: src/gui/popups/popupmenu.cpp:1606
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1703
+#: src/gui/popups/popupmenu.cpp:1610
msgid "Add to trade all"
msgstr ""
@@ -2240,66 +2240,73 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1711 src/gui/popups/popupmenu.cpp:1871
-#: src/gui/popups/popupmenu.cpp:1914 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:898 src/gui/windows/setupwindow.cpp:102
+#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
+#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
msgid "Store"
msgstr "存储"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1719
+#: src/gui/popups/popupmenu.cpp:1626
msgid "Store 10"
msgstr "商店10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1724
+#: src/gui/popups/popupmenu.cpp:1631
msgid "Store half"
msgstr "商店的一半"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1728
+#: src/gui/popups/popupmenu.cpp:1635
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1732
+#: src/gui/popups/popupmenu.cpp:1639
msgid "Store all"
msgstr "商店所有"
#. TRANSLATORS: popup menu item
+#. TRANSLATORS: sub menu for craft
+#: src/gui/popups/popupmenu.cpp:1653
+#, fuzzy
+msgid "Move to craft..."
+msgstr "移动到目标"
+
+#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1742 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/windows/inventorywindow.cpp:294
msgid "Retrieve"
msgstr "取回"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1671
msgid "Retrieve 10"
msgstr "拿出10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1755
+#: src/gui/popups/popupmenu.cpp:1676
msgid "Retrieve half"
msgstr "拿出一半"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1759
+#: src/gui/popups/popupmenu.cpp:1680
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1763
+#: src/gui/popups/popupmenu.cpp:1684
msgid "Retrieve all"
msgstr "检索所有"
@@ -2310,56 +2317,56 @@ msgstr "检索所有"
#. TRANSLATORS: default use button name
#. TRANSLATORS: skills dialog button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1827 src/gui/popups/popupmenu.cpp:2671
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:785 src/gui/windows/skilldialog.cpp:90
-#: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
-#: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
+#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
+#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1929
+#: src/gui/popups/popupmenu.cpp:1850
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
msgid "Hide"
msgstr "隐藏"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1967 src/gui/popups/popupmenu.cpp:2028
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
msgid "Show"
msgstr "显示"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2035
+#: src/gui/popups/popupmenu.cpp:1956
msgid "Open yellow bar settings"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:1958
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2081 src/gui/popups/popupmenu.cpp:2100
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
msgid "Move up"
msgstr "x"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2087 src/gui/popups/popupmenu.cpp:2106
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
msgid "Move down"
msgstr ""
@@ -2367,30 +2374,30 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2181 src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2199
+#: src/gui/popups/popupmenu.cpp:2120
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2202
+#: src/gui/popups/popupmenu.cpp:2123
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2220
+#: src/gui/popups/popupmenu.cpp:2141
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2238
+#: src/gui/popups/popupmenu.cpp:2159
msgid "Show window"
msgstr ""
@@ -2398,7 +2405,7 @@ msgstr ""
#. TRANSLATORS: skill level
#. TRANSLATORS: status bar label
#. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2292 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
#: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
#: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
#, c-format
@@ -2407,134 +2414,135 @@ msgstr "等级:%d"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2297
+#: src/gui/popups/popupmenu.cpp:2218
msgid "Max level"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2343 src/gui/popups/popupmenu.cpp:2379
-#: src/gui/popups/popupmenu.cpp:2418 src/gui/popups/popupmenu.cpp:2436
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2346 src/gui/popups/popupmenu.cpp:2382
-#: src/gui/popups/popupmenu.cpp:2421 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
msgid "Ignore"
msgstr "忽略"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2349 src/gui/popups/popupmenu.cpp:2424
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2352 src/gui/popups/popupmenu.cpp:2385
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2355 src/gui/popups/popupmenu.cpp:2388
-#: src/gui/popups/popupmenu.cpp:2400 src/gui/popups/popupmenu.cpp:2409
-#: src/gui/popups/popupmenu.cpp:2427
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2365
+#: src/gui/popups/popupmenu.cpp:2286
msgid "Be friend"
msgstr "是朋友"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2394
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2415
-#: src/gui/popups/popupmenu.cpp:2433
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2452
+#: src/gui/popups/popupmenu.cpp:2373
msgid "Follow"
msgstr "按照"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2456
+#: src/gui/popups/popupmenu.cpp:2377
msgid "Imitate"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2499
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
msgid "Buy (?)"
msgstr "购买(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2487 src/gui/popups/popupmenu.cpp:2502
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
msgid "Sell (?)"
msgstr "出售(?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2540
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2485
#, c-format
msgid "Join chat %s"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2573
+#: src/gui/popups/popupmenu.cpp:2494
msgid "Show Items"
msgstr "显示项目"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2590
+#: src/gui/popups/popupmenu.cpp:2511
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2595
+#. TRANSLATORS: popup menu item
+#: src/gui/popups/popupmenu.cpp:2518
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2647
+#: src/gui/popups/popupmenu.cpp:2570
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Protect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2686 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:906
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:909
msgid "Drop..."
msgstr "掉落..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2612
msgid "Drop all"
msgstr "所有"
@@ -2542,64 +2550,71 @@ msgstr "所有"
#. TRANSLATORS: drop item
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2695 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:911
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:914
msgid "Drop"
msgstr "丢弃"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2706
+#: src/gui/popups/popupmenu.cpp:2629
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2714
+#: src/gui/popups/popupmenu.cpp:2637
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2719
+#: src/gui/popups/popupmenu.cpp:2642
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2725
+#: src/gui/popups/popupmenu.cpp:2648
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2733
+#: src/gui/popups/popupmenu.cpp:2656
msgid "Kick"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2741 src/gui/popups/popupmenu.cpp:2745
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/popups/popupmenu.cpp:2753
-#: src/gui/popups/popupmenu.cpp:2757
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
#, c-format
msgid "Mute %d"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2762 src/gui/popups/popupmenu.cpp:2766
-#: src/gui/popups/popupmenu.cpp:2770 src/gui/popups/popupmenu.cpp:2774
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
#, c-format
msgid "Unmute %d"
msgstr ""
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: move current item to craft slot
+#: src/gui/popups/popupmenu.cpp:2724
+#, fuzzy, c-format
+msgid "Move to craft %d"
+msgstr "移动到目标"
+
#. TRANSLATORS: skill level
#: src/gui/popups/skillpopup.cpp:118
#, c-format
@@ -2612,13 +2627,13 @@ msgid "Level: Unknown"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:43
+#: src/gui/setupinputpages.cpp:44
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: long button name for shortcuts window.
-#: src/gui/setupinputpages.cpp:47 src/gui/windowmenu.cpp:132
+#: src/gui/setupinputpages.cpp:48 src/gui/windowmenu.cpp:132
msgid "Shortcuts"
msgstr "快捷键"
@@ -2626,15 +2641,21 @@ msgstr "快捷键"
#. TRANSLATORS: settings group
#. TRANSLATORS: long button name for windows list menu.
#. TRANSLATORS: input action label
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:330
+#: src/gui/setupinputpages.cpp:50 src/gui/widgets/tabs/setup_other.cpp:330
#: src/gui/windowmenu.cpp:184 src/input/pages/windows.cpp:34
msgid "Windows"
msgstr ""
#. TRANSLATORS: input tab sub tab name
+#. TRANSLATORS: inventory type name
+#: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
+msgid "Craft"
+msgstr ""
+
+#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupinputpages.cpp:51 src/gui/windows/emotewindow.cpp:55
+#: src/gui/setupinputpages.cpp:54 src/gui/windows/emotewindow.cpp:55
#: src/gui/windows/emotewindow.cpp:114
msgid "Emotes"
msgstr ""
@@ -2643,7 +2664,7 @@ msgstr ""
#. TRANSLATORS: settings tab name
#. TRANSLATORS: longt button name for chat window.
#. TRANSLATORS: chat window name
-#: src/gui/setupinputpages.cpp:55 src/gui/widgets/tabs/setup_chat.cpp:40
+#: src/gui/setupinputpages.cpp:58 src/gui/widgets/tabs/setup_chat.cpp:40
#: src/gui/windowmenu.cpp:89 src/gui/windows/chatwindow.cpp:88
msgid "Chat"
msgstr "聊天"
@@ -2654,7 +2675,7 @@ msgstr "聊天"
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: input action group
#. TRANSLATORS: input action name
-#: src/gui/setupinputpages.cpp:57 src/gui/userpalette.cpp:383
+#: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
#: src/gui/widgets/tabs/setup_audio.cpp:155
#: src/gui/widgets/tabs/setup_chat.cpp:290
#: src/gui/widgets/tabs/setup_other.cpp:352
@@ -2665,7 +2686,7 @@ msgid "Other"
msgstr "其他"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupinputpages.cpp:59
+#: src/gui/setupinputpages.cpp:62
msgid "Gui"
msgstr ""
@@ -2943,14 +2964,14 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:700 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
#: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
#, c-format
msgid "Money: %s"
msgstr "金币: %s"
#. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:368 src/gui/widgets/itemcontainer.cpp:490
+#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
msgid "Eq."
msgstr ""
@@ -3038,7 +3059,7 @@ msgstr "编辑"
#. TRANSLATORS: skill level
#. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
@@ -3126,13 +3147,13 @@ msgid "%s whispers: %s"
msgstr "%s私语:%s"
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:533
+#: src/gui/widgets/tabs/chat/chattab.cpp:536
#, c-format
msgid "%s is now Online."
msgstr ""
#. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:539
+#: src/gui/widgets/tabs/chat/chattab.cpp:542
#, c-format
msgid "%s is now Offline."
msgstr ""
@@ -4115,37 +4136,37 @@ msgid "Alpha:"
msgstr "阿尔法:"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:64
+#: src/gui/widgets/tabs/setup_input.cpp:65
msgid "Assign"
msgstr "分配"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:66
+#: src/gui/widgets/tabs/setup_input.cpp:67
msgid "Unassign"
msgstr "取消分配"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:68
+#: src/gui/widgets/tabs/setup_input.cpp:69
msgid "Default"
msgstr "预设"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:70
+#: src/gui/widgets/tabs/setup_input.cpp:71
msgid "Reset all keys"
msgstr ""
#. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:79
+#: src/gui/widgets/tabs/setup_input.cpp:80
msgid "Input"
msgstr ""
#. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:158
+#: src/gui/widgets/tabs/setup_input.cpp:159
msgid "Key Conflict(s) Detected."
msgstr "检测到按键冲突."
#. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:160
+#: src/gui/widgets/tabs/setup_input.cpp:161
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4154,8 +4175,8 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:332
-#: src/gui/windows/questswindow.cpp:205
+#: src/gui/widgets/tabs/setup_input.cpp:333
+#: src/gui/windows/questswindow.cpp:206
msgid "unknown"
msgstr ""
@@ -4497,7 +4518,7 @@ msgstr ""
#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_other.cpp:275 src/gui/windowmenu.cpp:150
#: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:241
msgid "Shop"
msgstr "商店"
@@ -5557,7 +5578,7 @@ msgstr ""
#. TRANSLATORS: long button name for quests window.
#. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
msgid "Quests"
msgstr ""
@@ -5601,7 +5622,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:102 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:243
msgid "Equipment"
msgstr "装备"
@@ -5613,7 +5634,7 @@ msgstr ""
#. TRANSLATORS: long button name for inventory window.
#. TRANSLATORS: inventory window name
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:106 src/gui/windows/inventorywindow.cpp:152
#: src/resources/inventory/inventory.cpp:310
msgid "Inventory"
msgstr "物品栏"
@@ -5626,7 +5647,7 @@ msgstr ""
#. TRANSLATORS: long button name for cart window.
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:110 src/gui/windows/inventorywindow.cpp:239
#: src/resources/inventory/inventory.cpp:326
msgid "Cart"
msgstr ""
@@ -5643,7 +5664,7 @@ msgstr "技能"
#. TRANSLATORS: long button name for skills window.
#. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
msgid "Skills"
msgstr "技能"
@@ -5780,7 +5801,7 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
-#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:120
+#: src/gui/windows/buydialog.cpp:285 src/gui/windows/charcreatedialog.cpp:110
#: src/gui/windows/charselectdialog.cpp:613 src/gui/windows/socialwindow.cpp:77
msgid "Create"
msgstr "建立"
@@ -5886,99 +5907,100 @@ msgstr ""
msgid "Name:"
msgstr "姓名:"
+#. TRANSLATORS: char create dialog button
+#: src/gui/windows/charcreatedialog.cpp:100
+msgid "^"
+msgstr ""
+
+#. TRANSLATORS: char create dialog button
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:86
-#: src/gui/windows/charcreatedialog.cpp:95
-#: src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charcreatedialog.cpp:198
-#: src/gui/windows/charcreatedialog.cpp:208 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:102
+#: src/gui/windows/charcreatedialog.cpp:190
+#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:224 src/gui/windows/outfitwindow.cpp:65
msgid ">"
msgstr ">"
+#. TRANSLATORS: char create dialog label
+#: src/gui/windows/charcreatedialog.cpp:108
+#: src/gui/windows/charcreatedialog.cpp:590
+#, c-format
+msgid "Please distribute %d points"
+msgstr "请分发%d点数"
+
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:90
-#: src/gui/windows/charcreatedialog.cpp:97
-#: src/gui/windows/charcreatedialog.cpp:200
-#: src/gui/windows/charcreatedialog.cpp:210 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:194
+#: src/gui/windows/charcreatedialog.cpp:205
+#: src/gui/windows/charcreatedialog.cpp:216
+#: src/gui/windows/charcreatedialog.cpp:226 src/gui/windows/outfitwindow.cpp:63
msgid "<"
msgstr "<"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:92
+#: src/gui/windows/charcreatedialog.cpp:196
msgid "Hair color:"
msgstr "头发颜色:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:99
+#: src/gui/windows/charcreatedialog.cpp:207
msgid "Hair style:"
msgstr "发型:"
-#. TRANSLATORS: char create dialog button
-#: src/gui/windows/charcreatedialog.cpp:110
-msgid "^"
-msgstr ""
-
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:552
-#, c-format
-msgid "Please distribute %d points"
-msgstr "请分发%d点数"
-
-#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:202
+#: src/gui/windows/charcreatedialog.cpp:218
msgid "Race:"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:212
+#: src/gui/windows/charcreatedialog.cpp:228
msgid "Look:"
msgstr ""
#. TRANSLATORS: one char size female character gender
#. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:229 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:245 src/gui/windows/socialwindow.cpp:73
msgid "F"
msgstr ""
#. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:235
-#: src/gui/windows/charcreatedialog.cpp:242
-#: src/gui/windows/charcreatedialog.cpp:250
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/charcreatedialog.cpp:258
+#: src/gui/windows/charcreatedialog.cpp:266
msgid "M"
msgstr ""
#. TRANSLATORS: one char size other character gender
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:237
-#: src/gui/windows/charcreatedialog.cpp:254
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/charcreatedialog.cpp:253
+#: src/gui/windows/charcreatedialog.cpp:270
+#: src/gui/windows/inventorywindow.cpp:223
msgid "O"
msgstr ""
#. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:260
msgid "U"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:426
+#: src/gui/windows/charcreatedialog.cpp:464
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字需要至少4个字符."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:542
+#: src/gui/windows/charcreatedialog.cpp:580
msgid "Character stats OK"
msgstr "角色状态可以"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:558
+#: src/gui/windows/charcreatedialog.cpp:596
#, c-format
msgid "Please remove %d points"
msgstr "请删除%d点数"
@@ -6234,7 +6256,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:67
+#: src/gui/windows/inventorywindow.cpp:204 src/gui/windows/outfitwindow.cpp:67
#: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
#: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
#: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6246,27 +6268,27 @@ msgid "Equip"
msgstr "装备"
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:225
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
msgid "E"
msgstr ""
#. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1047
+#: src/gui/windows/inventorywindow.cpp:1050
msgid "Insert card request"
msgstr ""
#. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1049
+#: src/gui/windows/inventorywindow.cpp:1052
#, c-format
msgid "Insert %s into %s?"
msgstr ""
@@ -6884,42 +6906,42 @@ msgid "Personal Shop - %s"
msgstr ""
#. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:92
+#: src/gui/windows/skilldialog.cpp:93
msgid "Up"
msgstr "升级"
#. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:207
+#: src/gui/windows/skilldialog.cpp:208
#, c-format
msgid "Skill points available: %d"
msgstr "技能点:%d个"
#. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:305
+#: src/gui/windows/skilldialog.cpp:306
#, c-format
msgid "Skill Set %d"
msgstr ""
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:326
+#: src/gui/windows/skilldialog.cpp:327
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
#. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:515
+#: src/gui/windows/skilldialog.cpp:516
#, c-format
msgid "Failed skill: %s"
msgstr ""
#. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:810
#, c-format
msgid "Add text to skill %s"
msgstr ""
#. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:813
msgid "Text: "
msgstr ""
@@ -7603,6 +7625,16 @@ msgid "Show smiles"
msgstr ""
#. TRANSLATORS: input action name
+#: src/input/pages/craft.cpp:32 src/input/pages/craft.cpp:38
+#: src/input/pages/craft.cpp:44 src/input/pages/craft.cpp:50
+#: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
+#: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
+#: src/input/pages/craft.cpp:80
+#, fuzzy, c-format
+msgid "Craft shortcut %d"
+msgstr "物品快捷 %d"
+
+#. TRANSLATORS: input action name
#: src/input/pages/emotes.cpp:35
msgid "Emote modifiers keys"
msgstr ""
@@ -8598,8 +8630,8 @@ msgstr "您已被永久禁止进入游戏。请联系GM团队."
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-msgid "Client too old."
-msgstr "客户端太旧."
+msgid "Client too old or wrong server type."
+msgstr ""
#. TRANSLATORS: error message
#: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9005,7 +9037,7 @@ msgstr ""
#. TRANSLATORS: unknown item message
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:242
+#: src/resources/db/itemdb.cpp:243
msgid "Unknown item"
msgstr "未知物品"
@@ -9025,7 +9057,7 @@ msgid "New password too short."
msgstr "新密码太短."
#. TRANSLATORS: mail message notification
-#: src/net/eathena/mailrecv.cpp:148
+#: src/net/eathena/mailrecv.cpp:158
#, c-format
msgid "You have new mail from %s with subject %s"
msgstr ""
@@ -9276,157 +9308,157 @@ msgstr ""
#. TRANSLATORS: item info name
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
-#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
-#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
+#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
+#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知怪兽"
#. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:99
+#: src/resources/db/itemdb.cpp:100
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:101
+#: src/resources/db/itemdb.cpp:102
#, c-format
msgid "Min attack %s"
msgstr ""
#. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:103
+#: src/resources/db/itemdb.cpp:104
#, c-format
msgid "Max attack %s"
msgstr ""
#. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:105
+#: src/resources/db/itemdb.cpp:106
#, c-format
msgid "Critical attack %s"
msgstr ""
#. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:107
+#: src/resources/db/itemdb.cpp:108
#, c-format
msgid "M. Attack %s"
msgstr ""
#. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:109
+#: src/resources/db/itemdb.cpp:110
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:111
+#: src/resources/db/itemdb.cpp:112
#, c-format
msgid "Min defense %s"
msgstr ""
#. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:113
+#: src/resources/db/itemdb.cpp:114
#, c-format
msgid "Max defense %s"
msgstr ""
#. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:115
+#: src/resources/db/itemdb.cpp:116
#, c-format
msgid "Critical defense %s"
msgstr ""
#. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:117
+#: src/resources/db/itemdb.cpp:118
#, c-format
msgid "M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:119
+#: src/resources/db/itemdb.cpp:120
#, c-format
msgid "Min M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:121
+#: src/resources/db/itemdb.cpp:122
#, c-format
msgid "Max M. Defense %s"
msgstr ""
#. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:123
+#: src/resources/db/itemdb.cpp:124
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:125
+#: src/resources/db/itemdb.cpp:126
#, c-format
msgid "Max HP %s"
msgstr ""
#. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:127
+#: src/resources/db/itemdb.cpp:128
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:129
+#: src/resources/db/itemdb.cpp:130
#, c-format
msgid "Max MP %s"
msgstr ""
#. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:131
+#: src/resources/db/itemdb.cpp:132
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:133
+#: src/resources/db/itemdb.cpp:134
#, c-format
msgid "Speed %s"
msgstr ""
#. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:135
+#: src/resources/db/itemdb.cpp:136
#, c-format
msgid "Range %s"
msgstr ""
#. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:137
+#: src/resources/db/itemdb.cpp:138
#, c-format
msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:139
+#: src/resources/db/itemdb.cpp:140
#, c-format
msgid "Min flee %s"
msgstr ""
#. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:141
+#: src/resources/db/itemdb.cpp:142
#, c-format
msgid "Max flee %s"
msgstr ""
#. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:143
+#: src/resources/db/itemdb.cpp:144
#, c-format
msgid "Card slots %s"
msgstr ""
#. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:100
+#: src/resources/db/petdb.cpp:101
msgid "pet"
msgstr ""
#. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:101
+#: src/resources/db/skillunitdb.cpp:102
msgid "skill"
msgstr ""
@@ -9440,11 +9472,6 @@ msgstr "仓库"
msgid "Npc"
msgstr ""
-#. TRANSLATORS: inventory type name
-#: src/resources/inventory/inventory.cpp:336
-msgid "Craft"
-msgstr ""
-
#. TRANSLATORS: notification message
#: src/resources/notifications.h:38
msgid "Thanks for buying."
@@ -10410,3 +10437,6 @@ msgstr ""
#, c-format
msgid "%d seconds"
msgstr ""
+
+#~ msgid "Client too old."
+#~ msgstr "客户端太旧."