summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-05-19 23:52:10 +0300
committerAndrei Karas <akaras@inbox.ru>2018-05-19 23:52:10 +0300
commitb56d398bf575459f40fcf27052ab98311af4fcd6 (patch)
tree1e230e426dfe81c35c080e47c83254b6a92120c9 /po/zh_CN.po
parent62f6aea80258af22dd939546c29fcd85c489d965 (diff)
downloadplus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.gz
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.bz2
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.tar.xz
plus-b56d398bf575459f40fcf27052ab98311af4fcd6.zip
Update translations.
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po1040
1 files changed, 559 insertions, 481 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 926935faf..20469cb98 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2018-02-19 05:18+0300\n"
-"PO-Revision-Date: 2017-09-30 13:55+0000\n"
+"POT-Creation-Date: 2018-05-19 23:51+0300\n"
+"PO-Revision-Date: 2018-03-02 14:58+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
"language/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1590
+#: src/actormanager.cpp:1592
msgid "Visible on map"
msgstr "在地图上可见"
@@ -46,12 +46,12 @@ msgid "miss"
msgstr "失误"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2568 src/gui/windows/whoisonline.cpp:890
+#: src/being/being.cpp:2567 src/gui/windows/whoisonline.cpp:890
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2573 src/gui/windows/whoisonline.cpp:895
+#: src/being/being.cpp:2572 src/gui/windows/whoisonline.cpp:895
msgid "I"
msgstr "I"
@@ -63,53 +63,53 @@ msgid "You were killed by %s."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:895
+#: src/being/localplayer.cpp:890
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:899
+#: src/being/localplayer.cpp:894
msgid "Item is too heavy."
msgstr "项目是太重了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:903
+#: src/being/localplayer.cpp:898
msgid "Item is too far away."
msgstr "物品太远了."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:907
+#: src/being/localplayer.cpp:902
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:911
+#: src/being/localplayer.cpp:906
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:915
+#: src/being/localplayer.cpp:910
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:919
+#: src/being/localplayer.cpp:914
msgid "You can't pickup this amount of items."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:923
+#: src/being/localplayer.cpp:918
msgid "Your item stack has max amount."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:930
+#: src/being/localplayer.cpp:925
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:966
+#: src/being/localplayer.cpp:961
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -117,58 +117,58 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1180 src/being/localplayer.cpp:1182
-#: src/being/localplayer.cpp:1218 src/being/localplayer.cpp:1232
+#: src/being/localplayer.cpp:1175 src/being/localplayer.cpp:1177
+#: src/being/localplayer.cpp:1213 src/being/localplayer.cpp:1227
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1188 src/being/localplayer.cpp:1196
-#: src/being/localplayer.cpp:1205
+#: src/being/localplayer.cpp:1183 src/being/localplayer.cpp:1191
+#: src/being/localplayer.cpp:1200
msgid "job"
msgstr ""
#. TRANSLATORS: get homunculus xp message
-#: src/being/localplayer.cpp:1229
+#: src/being/localplayer.cpp:1224
msgid "Homun"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1242
+#: src/being/localplayer.cpp:1237
msgid "hp"
msgstr ""
#. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1252
+#: src/being/localplayer.cpp:1247
msgid "mana"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2342
+#: src/being/localplayer.cpp:2337
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2348 src/being/localplayer.cpp:2373
+#: src/being/localplayer.cpp:2343 src/being/localplayer.cpp:2368
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2358
+#: src/being/localplayer.cpp:2353
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2364 src/being/localplayer.cpp:2378
+#: src/being/localplayer.cpp:2359 src/being/localplayer.cpp:2373
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2736
+#: src/being/localplayer.cpp:2731
#, c-format
msgid "You see %s"
msgstr ""
@@ -409,9 +409,8 @@ msgstr ""
#. TRANSLATORS: auto adjust settings message
#: src/game.cpp:852
-#, fuzzy
msgid "Auto lower Particle effects"
-msgstr "粒子效果"
+msgstr ""
#. TRANSLATORS: auto adjust settings message
#: src/game.cpp:873
@@ -803,32 +802,35 @@ msgstr "距离"
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
#: src/gamemodifiers.cpp:448 src/gui/dialogsmanager.cpp:186
-#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:165
+#: src/gui/dialogsmanager.cpp:206 src/gui/widgets/tabs/setup_input.cpp:169
#: src/gui/widgets/tabs/setup_theme.cpp:326
#: src/gui/widgets/tabs/setup_theme.cpp:362
-#: src/gui/widgets/tabs/setup_video.cpp:276
-#: src/gui/widgets/tabs/setup_video.cpp:305
-#: src/gui/widgets/tabs/setup_video.cpp:434
-#: src/gui/widgets/tabs/setup_video.cpp:450
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:306
+#: src/gui/widgets/tabs/setup_video.cpp:435
+#: src/gui/widgets/tabs/setup_video.cpp:451
#: src/gui/windows/changeemaildialog.cpp:171
#: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:477
-#: src/gui/windows/charselectdialog.cpp:274
-#: src/gui/windows/charselectdialog.cpp:317 src/gui/windows/editdialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:65
-#: src/gui/windows/editserverdialog.cpp:216
-#: src/gui/windows/itemamountwindow.cpp:206 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:251 src/gui/windows/textdialog.cpp:53
+#: src/gui/windows/charcreatedialog.cpp:509
+#: src/gui/windows/charselectdialog.cpp:281
+#: src/gui/windows/charselectdialog.cpp:330 src/gui/windows/editdialog.cpp:53
+#: src/gui/windows/editserverdialog.cpp:66
+#: src/gui/windows/editserverdialog.cpp:217
+#: src/gui/windows/itemamountwindow.cpp:215
+#: src/gui/windows/pincodedialog.cpp:49 src/gui/windows/quitdialog.cpp:67
+#: src/gui/windows/registerdialog.cpp:253 src/gui/windows/textdialog.cpp:53
#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
-#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:436
-#: src/net/eathena/charserverrecv.cpp:471
-#: src/net/eathena/charserverrecv.cpp:499 src/net/tmwa/charserverrecv.cpp:295
-#: src/progs/manaplus/actions/actions.cpp:179
-#: src/progs/manaplus/client.cpp:1487 src/progs/manaplus/client.cpp:1522
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:453
+#: src/net/eathena/charserverrecv.cpp:488
+#: src/net/eathena/charserverrecv.cpp:516 src/net/tmwa/charserverrecv.cpp:295
+#: src/pincodemanager.cpp:147 src/pincodemanager.cpp:206
+#: src/progs/manaplus/actions/actions.cpp:178
+#: src/progs/manaplus/client.cpp:1494 src/progs/manaplus/client.cpp:1529
msgid "OK"
msgstr "确定"
@@ -859,14 +861,14 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#: src/gui/dialogsmanager.cpp:119 src/gui/popups/popupmenu.cpp:842
#: src/gui/popups/popupmenu.cpp:934 src/gui/popups/popupmenu.cpp:1194
-#: src/gui/windows/didyouknowwindow.cpp:84
-#: src/gui/windows/inventorywindow.cpp:277
-#: src/gui/windows/inventorywindow.cpp:300
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/didyouknowwindow.cpp:85
+#: src/gui/windows/inventorywindow.cpp:309
+#: src/gui/windows/inventorywindow.cpp:343
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:63
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:134
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:114
-#: src/progs/dyecmd/client.cpp:565 src/progs/manaplus/client.cpp:922
-#: src/progs/manaplus/client.cpp:1401 src/progs/manaplus/client.cpp:1420
+#: src/progs/dyecmd/client.cpp:568 src/progs/manaplus/client.cpp:926
+#: src/progs/manaplus/client.cpp:1408 src/progs/manaplus/client.cpp:1427
msgid "Close"
msgstr "关闭"
@@ -912,7 +914,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_misc.cpp:100
#: src/gui/widgets/tabs/setup_perfomance.cpp:74
#: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:679
+#: src/gui/windows/equipmentwindow.cpp:666 src/gui/windows/serverdialog.cpp:687
msgid "default"
msgstr "默认"
@@ -1362,9 +1364,9 @@ msgstr "工会:%s"
#. TRANSLATORS: being popup label
#: src/gui/popups/beingpopup.cpp:212
-#, fuzzy, c-format
+#, c-format
msgid "Clan: %s"
-msgstr "评论: %s"
+msgstr ""
#. TRANSLATORS: being popup label
#: src/gui/popups/beingpopup.cpp:222
@@ -1560,9 +1562,9 @@ msgstr "说话"
#. TRANSLATORS: input action name
#. TRANSLATORS: npc context menu item
#: src/gui/popups/popupmenu.cpp:344 src/gui/popups/popupmenu.cpp:2604
-#: src/gui/windows/buydialog.cpp:213 src/gui/windows/buydialog.cpp:236
-#: src/gui/windows/buydialog.cpp:260 src/gui/windows/buydialog.cpp:338
-#: src/gui/windows/buydialog.cpp:342 src/gui/windows/buyselldialog.cpp:74
+#: src/gui/windows/buydialog.cpp:214 src/gui/windows/buydialog.cpp:237
+#: src/gui/windows/buydialog.cpp:261 src/gui/windows/buydialog.cpp:339
+#: src/gui/windows/buydialog.cpp:347 src/gui/windows/buyselldialog.cpp:74
#: src/gui/windows/shopwindow.cpp:171 src/input/pages/basic.cpp:250
#: src/resources/db/npcdb.cpp:170
msgid "Buy"
@@ -1580,7 +1582,7 @@ msgstr "购买"
#. TRANSLATORS: npc context menu item
#: src/gui/popups/popupmenu.cpp:347 src/gui/popups/popupmenu.cpp:2616
#: src/gui/widgets/selldialog.cpp:58 src/gui/widgets/selldialog.cpp:115
-#: src/gui/widgets/selldialog.cpp:153 src/gui/windows/buyselldialog.cpp:76
+#: src/gui/widgets/selldialog.cpp:171 src/gui/windows/buyselldialog.cpp:76
#: src/gui/windows/shopwindow.cpp:173 src/input/pages/basic.cpp:256
#: src/resources/db/npcdb.cpp:172
msgid "Sell"
@@ -1650,8 +1652,8 @@ msgstr ""
#. TRANSLATORS: character rename button
#. TRANSLATORS: shop window button
#: src/gui/popups/popupmenu.cpp:429 src/gui/popups/popupmenu.cpp:455
-#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:113
-#: src/gui/windows/shopwindow.cpp:197
+#: src/gui/popups/popupmenu.cpp:784 src/gui/windows/charselectdialog.cpp:115
+#: src/gui/windows/shopwindow.cpp:202
msgid "Rename"
msgstr "重命名"
@@ -1675,7 +1677,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: popup menu item
#: src/gui/popups/popupmenu.cpp:450 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:699
+#: src/gui/windows/inventorywindow.cpp:212 src/resources/db/itemdb.cpp:707
#: 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
@@ -1709,6 +1711,7 @@ msgstr ""
#. TRANSLATORS: connection dialog button
#. TRANSLATORS: edit server dialog button
#. TRANSLATORS: item amount window button
+#. TRANSLATORS: text dialog button
#. TRANSLATORS: quit dialog button
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: setup button
@@ -1741,10 +1744,11 @@ msgstr ""
#: src/gui/windows/changepassworddialog.cpp:58
#: src/gui/windows/charcreatedialog.cpp:115
#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:67
-#: src/gui/windows/itemamountwindow.cpp:208 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:106
-#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/editserverdialog.cpp:68
+#: src/gui/windows/itemamountwindow.cpp:221
+#: src/gui/windows/pincodedialog.cpp:59 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:66 src/gui/windows/setupwindow.cpp:106
+#: src/gui/windows/textcommandeditor.cpp:108 src/gui/windows/textdialog.cpp:61
#: src/gui/windows/updaterwindow.cpp:194 src/input/pages/gui.cpp:103
msgid "Cancel"
msgstr "取消"
@@ -1800,7 +1804,7 @@ msgstr ""
#. TRANSLATORS: warp to map item
#. TRANSLATORS: warp select button
#: src/gui/popups/popupmenu.cpp:794 src/gui/popups/popupmenu.cpp:824
-#: src/net/eathena/skillrecv.cpp:435
+#: src/net/eathena/skillrecv.cpp:436
msgid "Warp"
msgstr ""
@@ -1822,7 +1826,7 @@ msgstr ""
#. TRANSLATORS: outfits button tooltip
#. TRANSLATORS: outfits window name
#: src/gui/popups/popupmenu.cpp:862 src/gui/setupinputpages.cpp:58
-#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:241
+#: src/gui/windowmenu.cpp:172 src/gui/windows/inventorywindow.cpp:265
#: src/gui/windows/outfitwindow.cpp:61
msgid "Outfits"
msgstr "套装"
@@ -1854,8 +1858,10 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
+#. TRANSLATORS: clear pin code button
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:939 src/gui/windows/npcdialog.cpp:131
+#: src/gui/popups/popupmenu.cpp:939 src/gui/widgets/pincode.cpp:129
+#: src/gui/windows/npcdialog.cpp:131
msgid "Clear"
msgstr "清除"
@@ -2026,9 +2032,9 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1641 src/gui/popups/popupmenu.cpp:1824
-#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:272
-#: src/gui/windows/inventorywindow.cpp:295
-#: src/gui/windows/inventorywindow.cpp:939 src/gui/windows/setupwindow.cpp:108
+#: src/gui/popups/popupmenu.cpp:1873 src/gui/windows/inventorywindow.cpp:297
+#: src/gui/windows/inventorywindow.cpp:331
+#: src/gui/windows/inventorywindow.cpp:985 src/gui/windows/setupwindow.cpp:108
msgid "Store"
msgstr "存储"
@@ -2065,8 +2071,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:274
-#: src/gui/windows/inventorywindow.cpp:297
+#: src/gui/popups/popupmenu.cpp:1685 src/gui/windows/inventorywindow.cpp:303
+#: src/gui/windows/inventorywindow.cpp:337
msgid "Retrieve"
msgstr "取回"
@@ -2105,10 +2111,10 @@ msgstr "检索所有"
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:1776 src/gui/popups/popupmenu.cpp:2808
#: src/gui/windows/inventorywindow.cpp:210
-#: src/gui/windows/inventorywindow.cpp:836 src/gui/windows/skilldialog.cpp:93
-#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:496
-#: src/gui/windows/skilldialog.cpp:763 src/gui/windows/skilldialog.cpp:878
-#: src/resources/db/itemdb.cpp:707 src/resources/db/itemdb.cpp:712
+#: src/gui/windows/inventorywindow.cpp:882 src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:194 src/gui/windows/skilldialog.cpp:521
+#: src/gui/windows/skilldialog.cpp:788 src/gui/windows/skilldialog.cpp:903
+#: src/resources/db/itemdb.cpp:715 src/resources/db/itemdb.cpp:720
#: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
msgid "Use"
msgstr "使用"
@@ -2261,7 +2267,7 @@ msgstr ""
#. TRANSLATORS: skill cast type
#. TRANSLATORS: button in input settings tab
#: src/gui/popups/popupmenu.cpp:2417 src/gui/popups/skillpopup.cpp:171
-#: src/gui/widgets/tabs/setup_input.cpp:69
+#: src/gui/widgets/tabs/setup_input.cpp:71
msgid "Default"
msgstr "预设"
@@ -2297,7 +2303,7 @@ msgstr ""
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2516
-#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2555 src/gui/windows/confirmdialog.cpp:70
msgid "Ignore"
msgstr "忽略"
@@ -2403,8 +2409,8 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:225
-#: src/gui/windows/inventorywindow.cpp:947
+#: src/gui/popups/popupmenu.cpp:2874 src/gui/windows/inventorywindow.cpp:230
+#: src/gui/windows/inventorywindow.cpp:993
msgid "Drop..."
msgstr "掉落..."
@@ -2419,7 +2425,7 @@ msgstr "所有"
#. TRANSLATORS: long button name for drops window.
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2883 src/gui/windowmenu.cpp:157
-#: src/gui/windows/inventorywindow.cpp:952
+#: src/gui/windows/inventorywindow.cpp:998
msgid "Drop"
msgstr "丢弃"
@@ -2478,7 +2484,7 @@ msgstr "仓库"
#. TRANSLATORS: cart button tooltip
#. TRANSLATORS: inventory type name
#: src/gui/popups/popupmenu.cpp:2939 src/gui/windowmenu.cpp:122
-#: src/gui/windows/inventorywindow.cpp:243
+#: src/gui/windows/inventorywindow.cpp:267
#: src/resources/inventory/inventory.cpp:375
msgid "Cart"
msgstr ""
@@ -2696,10 +2702,10 @@ msgstr ""
#. TRANSLATORS: info header
#. TRANSLATORS: info message
#: src/gui/popups/popupmenu.cpp:3316 src/gui/popups/popupmenu.cpp:3345
-#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:120
-#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:432
-#: src/net/eathena/charserverrecv.cpp:468
+#: src/gui/popups/popupmenu.cpp:3364 src/gui/windows/charselectdialog.cpp:81
+#: src/gui/windows/clanwindow.cpp:63 src/gui/windows/serverdialog.cpp:122
+#: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:449
+#: src/net/eathena/charserverrecv.cpp:485
msgid "Info"
msgstr "信息"
@@ -2891,7 +2897,7 @@ msgstr "聊天"
#. TRANSLATORS: input action group
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:62 src/gui/userpalette.cpp:474
-#: src/gui/widgets/tabs/setup_audio.cpp:178
+#: src/gui/widgets/tabs/setup_audio.cpp:188
#: src/gui/widgets/tabs/setup_chat.cpp:325
#: src/gui/widgets/tabs/setup_misc.cpp:500
#: src/gui/widgets/tabs/setup_visual.cpp:223 src/input/pages/chat.cpp:145
@@ -3204,7 +3210,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/widgets/attrs/changedisplay.cpp:48
#: src/gui/widgets/attrs/changedisplay.cpp:70
-#: src/gui/widgets/selldialog.cpp:141 src/gui/windows/buydialog.cpp:352
+#: src/gui/widgets/selldialog.cpp:155 src/gui/windows/buydialog.cpp:360
#: src/gui/windows/statuswindow.cpp:459 src/gui/windows/statuswindow.cpp:522
msgid "Max"
msgstr "最大"
@@ -3216,9 +3222,9 @@ msgstr "最大"
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
#: src/gui/widgets/attrs/changedisplay.cpp:50
-#: src/gui/widgets/selldialog.cpp:137 src/gui/windows/buydialog.cpp:332
-#: src/gui/windows/itemamountwindow.cpp:204
-#: src/gui/windows/itemamountwindow.cpp:240 src/gui/windows/npcdialog.cpp:127
+#: src/gui/widgets/selldialog.cpp:143 src/gui/windows/buydialog.cpp:333
+#: src/gui/windows/itemamountwindow.cpp:209
+#: src/gui/windows/itemamountwindow.cpp:263 src/gui/windows/npcdialog.cpp:127
msgid "+"
msgstr "+"
@@ -3232,7 +3238,7 @@ msgstr ""
#. TRANSLATORS: money label
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:146
-#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/statuswindow.cpp:76
+#: src/gui/windows/inventorywindow.cpp:794 src/gui/windows/statuswindow.cpp:76
#: src/gui/windows/statuswindow.cpp:223 src/gui/windows/statuswindow.cpp:315
#, c-format
msgid "Money: %s"
@@ -3259,9 +3265,9 @@ msgstr ""
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: shop window label
#. TRANSLATORS: trade window button
-#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:338
+#: src/gui/widgets/selldialog.cpp:115 src/gui/windows/buydialog.cpp:339
#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/npcdialog.cpp:136
-#: src/gui/windows/serverdialog.cpp:112 src/gui/windows/shopwindow.cpp:127
+#: src/gui/windows/serverdialog.cpp:113 src/gui/windows/shopwindow.cpp:127
#: src/gui/windows/tradewindow.cpp:89
msgid "Add"
msgstr "添加"
@@ -3273,10 +3279,10 @@ msgstr "添加"
#. TRANSLATORS: servers dialog button
#. TRANSLATORS: sell dialog button
#. TRANSLATORS: input action name
-#: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:350
+#: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:358
#: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
#: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:108
-#: src/gui/windows/textselectdialog.cpp:94 src/input/pages/basic.cpp:226
+#: src/gui/windows/textselectdialog.cpp:96 src/input/pages/basic.cpp:226
msgid "Quit"
msgstr "退出"
@@ -3285,24 +3291,24 @@ msgstr "退出"
#. You may change this symbol if your language uses another.
#. TRANSLATORS: item amount window button
#. TRANSLATORS: npc dialog button
-#: src/gui/widgets/selldialog.cpp:139 src/gui/windows/buydialog.cpp:335
-#: src/gui/windows/itemamountwindow.cpp:202
-#: src/gui/windows/itemamountwindow.cpp:237 src/gui/windows/npcdialog.cpp:129
+#: src/gui/widgets/selldialog.cpp:149 src/gui/windows/buydialog.cpp:336
+#: src/gui/windows/itemamountwindow.cpp:203
+#: src/gui/windows/itemamountwindow.cpp:257 src/gui/windows/npcdialog.cpp:129
msgid "-"
msgstr "-"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
-#: src/gui/widgets/selldialog.cpp:148 src/gui/widgets/selldialog.cpp:370
-#: src/gui/windows/buydialog.cpp:318 src/gui/windows/buydialog.cpp:752
+#: src/gui/widgets/selldialog.cpp:165 src/gui/widgets/selldialog.cpp:391
+#: src/gui/windows/buydialog.cpp:319 src/gui/windows/buydialog.cpp:760
#, c-format
msgid "Price: %s / Total: %s"
msgstr "价格: %s / 总价: %s"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:377 src/gui/widgets/setupitem.cpp:518
-#: src/gui/windows/serverdialog.cpp:114
+#: src/gui/widgets/setupitem.cpp:378 src/gui/widgets/setupitem.cpp:523
+#: src/gui/windows/serverdialog.cpp:115
msgid "Edit"
msgstr "编辑"
@@ -3387,9 +3393,8 @@ msgstr ""
#. TRANSLATORS: clan name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:66
-#, fuzzy
msgid "Clan name"
-msgstr "未知怪兽"
+msgstr ""
#. TRANSLATORS: clan master name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:70
@@ -3398,42 +3403,41 @@ msgstr ""
#. TRANSLATORS: clan map name label
#: src/gui/widgets/tabs/clanwindowtabs.cpp:74
-#, fuzzy
msgid "Map name"
-msgstr "地图项"
+msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:54
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:201
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:254
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
msgid "Music:"
msgstr "音乐:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:56
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:207
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:258
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:213
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:268
msgid "Map:"
msgstr "地图:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:58
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:260
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:216
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:270
msgid "Map name:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:60
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:256
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:210
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:266
msgid "Minimap:"
msgstr "小地图:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:63
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:198
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:252
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:204
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
msgid "Cursor:"
msgstr "光标:"
@@ -3444,224 +3448,232 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:69
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:222
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:273
msgid "Map actors count:"
msgstr "地图演员数:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:71
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:177
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:73
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:233
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
+#, fuzzy
+msgid "Map atlas count:"
+msgstr "地图演员数:"
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:76
#: src/gui/widgets/tabs/debugwindowtabs.cpp:183
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:189
msgid "Player Position:"
msgstr "的位置:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:77
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:235
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:245
msgid "Draw calls:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:82
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:243
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:253
msgid "Texture binds:"
msgstr ""
#. TRANSLATORS: debug window label, frames per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:85
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:90
#, c-format
msgid "%d FPS"
msgstr "%d的FPS"
#. TRANSLATORS: debug window label, logic per second
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:87
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:272
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:92
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:289
#, c-format
msgid "%d LPS"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:98
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:131
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:103
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:136
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (软件)"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:105
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:110
#, c-format
msgid "%d FPS (normal OpenGL)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:109
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:114
#, c-format
msgid "%d FPS (safe OpenGL)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:113
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:118
#, c-format
msgid "%d FPS (mobile OpenGL ES)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:117
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:122
#, c-format
msgid "%d FPS (mobile OpenGL ES 2)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:121
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:126
#, c-format
msgid "%d FPS (modern OpenGL)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:125
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:130
#, c-format
msgid "%d FPS (SDL2 default)"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:153
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:228
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:159
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:238
msgid "Textures count:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:217
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:223
#, c-format
msgid "Particle count: %d"
msgstr "粒子数: %d个"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:410
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:427
msgid "Target:"
msgstr "目标:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:412
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:429
msgid "Target Id:"
msgstr "目标ID:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:284
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:348
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:414
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:301
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:431
msgid "Target type:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:286
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:303
msgid "Target level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:288
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:364
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:305
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
msgid "Target race:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:290
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:307
msgid "Target party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:292
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:309
msgid "Target guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:294
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:398
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:404
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:422
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:311
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:415
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:421
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
msgid "Attack delay:"
msgstr "攻击延迟:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:296
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:424
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:441
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:298
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:426
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:315
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:396
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:443
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:300
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:382
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:428
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:317
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:445
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:302
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:402
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:447
msgid "Karma:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:304
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:432
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:321
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:449
msgid "Manner:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:306
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:434
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:323
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:408
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
msgid "Effects:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:416
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:370
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:376
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:433
msgid "Target Level:"
msgstr "目标水平:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:367
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:418
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:384
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:435
msgid "Target Party:"
msgstr "目标:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:371
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:420
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:388
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:437
msgid "Target Guild:"
msgstr "目标公会:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:477
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:483
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:494
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:500
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:486
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:503
#, c-format
msgid "In: %d bytes/s"
msgstr "输入:%d 字节/"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:489
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:506
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3768,46 +3780,57 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:143
-msgid "Guild / party / clan message sound"
-msgstr ""
+#, fuzzy
+msgid "Guild message sound"
+msgstr "工会会长: %s"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:148
-msgid "Highlight message sound"
+msgid "Party message sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:153
-msgid "Global message sound"
+msgid "Clan message sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:158
-msgid "Error message sound"
+msgid "Highlight message sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:163
-msgid "Trade request sound"
+msgid "Global message sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:168
-msgid "Show window sound"
+msgid "Error message sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:173
-msgid "Hide window sound"
+msgid "Trade request sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:178
+msgid "Show window sound"
msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_audio.cpp:183
+msgid "Hide window sound"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_audio.cpp:193
msgid "Enable mumble voice chat"
msgstr "启用语音聊天"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_audio.cpp:189
+#: src/gui/widgets/tabs/setup_audio.cpp:199
msgid "Download music"
msgstr "下载音乐"
@@ -4332,27 +4355,27 @@ msgid "Assign"
msgstr "分配"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:67
+#: src/gui/widgets/tabs/setup_input.cpp:68
msgid "Unassign"
msgstr "取消分配"
#. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:71
+#: src/gui/widgets/tabs/setup_input.cpp:74
msgid "Reset all keys"
msgstr ""
#. TRANSLATORS: setting tab name
-#: src/gui/widgets/tabs/setup_input.cpp:80
+#: src/gui/widgets/tabs/setup_input.cpp:84
msgid "Input"
msgstr ""
#. TRANSLATORS: input settings error header
-#: src/gui/widgets/tabs/setup_input.cpp:159
+#: src/gui/widgets/tabs/setup_input.cpp:163
msgid "Key Conflict(s) Detected."
msgstr "检测到按键冲突."
#. TRANSLATORS: input settings error
-#: src/gui/widgets/tabs/setup_input.cpp:161
+#: src/gui/widgets/tabs/setup_input.cpp:165
#, c-format
msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4361,50 +4384,50 @@ msgstr ""
#. TRANSLATORS: unknown key name
#. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:333 src/resources/db/questdb.cpp:62
+#: src/gui/widgets/tabs/setup_input.cpp:337 src/resources/db/questdb.cpp:62
#: src/resources/db/questdb.cpp:255 src/resources/db/questdb.cpp:261
msgid "unknown"
msgstr ""
#. TRANSLATORS: joystick settings tab label
#: src/gui/widgets/tabs/setup_joystick.cpp:47
-#: src/gui/widgets/tabs/setup_joystick.cpp:141
+#: src/gui/widgets/tabs/setup_joystick.cpp:143
msgid "Press the button to start calibration"
msgstr "按下开始校准按钮"
#. TRANSLATORS: joystick settings tab button
#: src/gui/widgets/tabs/setup_joystick.cpp:49
-#: src/gui/widgets/tabs/setup_joystick.cpp:138
+#: src/gui/widgets/tabs/setup_joystick.cpp:140
msgid "Calibrate"
msgstr "校准"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:51
+#: src/gui/widgets/tabs/setup_joystick.cpp:52
msgid "Detect joysticks"
msgstr ""
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:53
+#: src/gui/widgets/tabs/setup_joystick.cpp:55
msgid "Enable joystick"
msgstr "启用游戏杆"
#. TRANSLATORS: joystick settings tab checkbox
-#: src/gui/widgets/tabs/setup_joystick.cpp:60
+#: src/gui/widgets/tabs/setup_joystick.cpp:62
msgid "Use joystick if client window inactive"
msgstr ""
#. TRANSLATORS: joystick settings tab name
-#: src/gui/widgets/tabs/setup_joystick.cpp:66
+#: src/gui/widgets/tabs/setup_joystick.cpp:68
msgid "Joystick"
msgstr "游戏杆"
#. TRANSLATORS: joystick settings tab button
-#: src/gui/widgets/tabs/setup_joystick.cpp:147
+#: src/gui/widgets/tabs/setup_joystick.cpp:149
msgid "Stop"
msgstr "停止"
#. TRANSLATORS: joystick settings tab label
-#: src/gui/widgets/tabs/setup_joystick.cpp:150
+#: src/gui/widgets/tabs/setup_joystick.cpp:152
msgid "Rotate the stick and don't press buttons"
msgstr ""
@@ -4724,7 +4747,7 @@ msgstr ""
#. TRANSLATORS: shop button tooltip
#: src/gui/widgets/tabs/setup_misc.cpp:344 src/gui/windowmenu.cpp:167
#: src/gui/windows/buyselldialog.cpp:43 src/gui/windows/buyselldialog.cpp:54
-#: src/gui/windows/inventorywindow.cpp:245
+#: src/gui/windows/inventorywindow.cpp:269
msgid "Shop"
msgstr "商店"
@@ -4933,14 +4956,14 @@ msgstr ""
#. TRANSLATORS: texture compression type
#. TRANSLATORS: confirm dialog button
#: src/gui/widgets/tabs/setup_perfomance.cpp:46
-#: src/gui/windows/confirmdialog.cpp:59
+#: src/gui/windows/confirmdialog.cpp:64
msgid "No"
msgstr "否"
#. TRANSLATORS: settings tab name
#. TRANSLATORS: perfoamance tab quick button
-#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:549
-#: src/progs/manaplus/client.cpp:906
+#: src/gui/widgets/tabs/setup_perfomance.cpp:61 src/progs/dyecmd/client.cpp:552
+#: src/progs/manaplus/client.cpp:910
msgid "Performance"
msgstr ""
@@ -5272,19 +5295,19 @@ msgstr "允许密语"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:81
-#: src/gui/windows/charselectdialog.cpp:82 src/gui/windows/mailwindow.cpp:72
-#: src/gui/windows/serverdialog.cpp:116 src/gui/windows/shopwindow.cpp:129
+#: src/gui/windows/charselectdialog.cpp:83 src/gui/windows/mailwindow.cpp:73
+#: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:129
#: src/gui/windows/textcommandeditor.cpp:112 src/input/pages/gui.cpp:109
msgid "Delete"
msgstr "删除"
#. TRANSLATORS: relation dialog name
-#: src/gui/widgets/tabs/setup_relations.cpp:87
+#: src/gui/widgets/tabs/setup_relations.cpp:88
msgid "Relations"
msgstr "关系"
#. TRANSLATORS: relation dialog label
-#: src/gui/widgets/tabs/setup_relations.cpp:112
+#: src/gui/widgets/tabs/setup_relations.cpp:113
msgid "When ignoring:"
msgstr "当忽略时:"
@@ -5356,8 +5379,8 @@ msgstr ""
#. TRANSLATORS: theme settings tab name
#. TRANSLATORS: theme tab quick button
-#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:555
-#: src/progs/manaplus/client.cpp:912
+#: src/gui/widgets/tabs/setup_theme.cpp:133 src/progs/dyecmd/client.cpp:558
+#: src/progs/manaplus/client.cpp:916
msgid "Theme"
msgstr "主题"
@@ -5384,8 +5407,8 @@ msgstr "主题更改"
#. TRANSLATORS: ok dialog message
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:360
-#: src/gui/widgets/tabs/setup_video.cpp:429
-#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:430
+#: src/gui/widgets/tabs/setup_video.cpp:448
msgid "Restart your client for the change to take effect."
msgstr "重启您的游戏客户端以使变更生效."
@@ -5477,9 +5500,9 @@ msgstr "FPS限制:"
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:86
-#: src/gui/widgets/tabs/setup_video.cpp:135
-#: src/gui/widgets/tabs/setup_video.cpp:352
-#: src/gui/widgets/tabs/setup_video.cpp:504
+#: src/gui/widgets/tabs/setup_video.cpp:136
+#: src/gui/widgets/tabs/setup_video.cpp:353
+#: src/gui/widgets/tabs/setup_video.cpp:505
msgid "Alt FPS limit: "
msgstr ""
@@ -5489,98 +5512,98 @@ msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:99
+#: src/gui/widgets/tabs/setup_video.cpp:100
msgid "High DPI"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:105
+#: src/gui/widgets/tabs/setup_video.cpp:106
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:108
+#: src/gui/widgets/tabs/setup_video.cpp:109
msgid "Custom cursor"
msgstr "自定义鼠标"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:113
+#: src/gui/widgets/tabs/setup_video.cpp:114
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:117
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings tab name
#. TRANSLATORS: video tab quick button
-#: src/gui/widgets/tabs/setup_video.cpp:120 src/progs/dyecmd/client.cpp:552
-#: src/progs/manaplus/client.cpp:909
+#: src/gui/widgets/tabs/setup_video.cpp:121 src/progs/dyecmd/client.cpp:555
+#: src/progs/manaplus/client.cpp:913
msgid "Video"
msgstr "视频"
#. TRANSLATORS: video settings label
#. TRANSLATORS: video settings label value
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:132
-#: src/gui/widgets/tabs/setup_video.cpp:137
-#: src/gui/widgets/tabs/setup_video.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:488
-#: src/gui/widgets/tabs/setup_video.cpp:501
+#: src/gui/widgets/tabs/setup_video.cpp:133
+#: src/gui/widgets/tabs/setup_video.cpp:138
+#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:489
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "None"
msgstr "w"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:252
+#: src/gui/widgets/tabs/setup_video.cpp:253
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "切换到窗口模式，并恢复旧的模式，也没有失败!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:259
+#: src/gui/widgets/tabs/setup_video.cpp:260
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:273
msgid "Switching to Full Screen"
msgstr "切换到全屏"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:274
+#: src/gui/widgets/tabs/setup_video.cpp:275
msgid "Restart needed for changes to take effect."
msgstr "重启生效."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:301
+#: src/gui/widgets/tabs/setup_video.cpp:302
msgid "Changing to OpenGL"
msgstr "切换到OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:303
+#: src/gui/widgets/tabs/setup_video.cpp:304
msgid "Applying change to OpenGL requires restart."
msgstr "运用改变为OpenGL需要重新开始."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:397
msgid "Custom resolution (example: 1024x768)"
msgstr "自定义分辨率 (例如: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:399
msgid "Enter new resolution: "
msgstr "输入新的分辨率: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:427
-#: src/gui/widgets/tabs/setup_video.cpp:445
+#: src/gui/widgets/tabs/setup_video.cpp:428
+#: src/gui/widgets/tabs/setup_video.cpp:446
msgid "Screen Resolution Changed"
msgstr "屏幕分辨率已更改"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:431
+#: src/gui/widgets/tabs/setup_video.cpp:432
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -5916,7 +5939,7 @@ msgstr ""
#. TRANSLATORS: help window name
#. TRANSLATORS: theme tab quick button
#: src/gui/windowmenu.cpp:78 src/gui/windows/helpwindow.cpp:57
-#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:918
+#: src/progs/dyecmd/client.cpp:564 src/progs/manaplus/client.cpp:922
msgid "Help"
msgstr "帮助"
@@ -5971,7 +5994,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: equipment button tooltip
#: src/gui/windowmenu.cpp:112 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:247
+#: src/gui/windows/inventorywindow.cpp:271
msgid "Equipment"
msgstr "装备"
@@ -6116,20 +6139,20 @@ msgstr "SET"
#. TRANSLATORS: setup window name
#. TRANSLATORS: setup tab quick button
#: src/gui/windowmenu.cpp:217 src/gui/windows/setupwindow.cpp:67
-#: src/progs/dyecmd/client.cpp:546 src/progs/manaplus/client.cpp:903
+#: src/progs/dyecmd/client.cpp:549 src/progs/manaplus/client.cpp:907
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: short key name
#. TRANSLATORS: outfits window label
-#: src/gui/windowmenu.cpp:351 src/gui/windows/outfitwindow.cpp:80
+#: src/gui/windowmenu.cpp:355 src/gui/windows/outfitwindow.cpp:80
#: src/gui/windows/outfitwindow.cpp:631
#, c-format
msgid "Key: %s"
msgstr "按键: %s"
#. TRANSLATORS: bank window money label
-#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:92
+#: src/gui/windows/bankwindow.cpp:48 src/gui/windows/bankwindow.cpp:94
#, c-format
msgid "Money in bank: %s"
msgstr ""
@@ -6140,7 +6163,7 @@ msgid "Withdraw"
msgstr ""
#. TRANSLATORS: bank window button
-#: src/gui/windows/bankwindow.cpp:54
+#: src/gui/windows/bankwindow.cpp:55
msgid "Deposit"
msgstr ""
@@ -6150,20 +6173,20 @@ msgid "Create items"
msgstr ""
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:327
+#: src/gui/windows/buydialog.cpp:328
msgid "Amount:"
msgstr ""
#. TRANSLATORS: buy dialog button
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/buydialog.cpp:338 src/gui/windows/charcreatedialog.cpp:113
-#: src/gui/windows/charselectdialog.cpp:629
+#: src/gui/windows/buydialog.cpp:339 src/gui/windows/charcreatedialog.cpp:113
+#: src/gui/windows/charselectdialog.cpp:654
msgid "Create"
msgstr "建立"
#. TRANSLATORS: buy dialog label
-#: src/gui/windows/buydialog.cpp:389
+#: src/gui/windows/buydialog.cpp:397
msgid "Filter:"
msgstr "过滤器:"
@@ -6218,15 +6241,15 @@ msgstr "电子邮件地址不匹配."
#. TRANSLATORS: error message header
#: src/gui/windows/changeemaildialog.cpp:168
#: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:473
-#: src/gui/windows/charselectdialog.cpp:313
-#: src/gui/windows/editserverdialog.cpp:211
-#: src/gui/windows/registerdialog.cpp:251 src/net/ea/charserverrecv.cpp:105
-#: src/net/eathena/charserverrecv.cpp:409
-#: src/net/eathena/charserverrecv.cpp:413
-#: src/net/eathena/charserverrecv.cpp:495 src/net/tmwa/charserverrecv.cpp:291
-#: src/progs/manaplus/client.cpp:1398 src/progs/manaplus/client.cpp:1417
-#: src/progs/manaplus/client.cpp:1622
+#: src/gui/windows/charcreatedialog.cpp:505
+#: src/gui/windows/charselectdialog.cpp:326
+#: src/gui/windows/editserverdialog.cpp:212
+#: src/gui/windows/registerdialog.cpp:253 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:426
+#: src/net/eathena/charserverrecv.cpp:430
+#: src/net/eathena/charserverrecv.cpp:512 src/net/tmwa/charserverrecv.cpp:291
+#: src/progs/manaplus/client.cpp:1405 src/progs/manaplus/client.cpp:1424
+#: src/progs/manaplus/client.cpp:1630
msgid "Error"
msgstr "错误"
@@ -6241,7 +6264,7 @@ msgstr "更换密码"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:118 src/gui/windows/registerdialog.cpp:75
+#: src/gui/windows/logindialog.cpp:121 src/gui/windows/registerdialog.cpp:77
msgid "Password:"
msgstr "密码:"
@@ -6282,8 +6305,8 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:85
-#: src/gui/windows/editserverdialog.cpp:81 src/gui/windows/logindialog.cpp:116
-#: src/gui/windows/registerdialog.cpp:73
+#: src/gui/windows/editserverdialog.cpp:82 src/gui/windows/logindialog.cpp:119
+#: src/gui/windows/registerdialog.cpp:75
msgid "Name:"
msgstr "姓名:"
@@ -6298,16 +6321,16 @@ msgstr ""
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
#: src/gui/windows/charcreatedialog.cpp:105
-#: src/gui/windows/charcreatedialog.cpp:197
-#: src/gui/windows/charcreatedialog.cpp:210
-#: src/gui/windows/charcreatedialog.cpp:221
-#: src/gui/windows/charcreatedialog.cpp:231 src/gui/windows/outfitwindow.cpp:66
+#: src/gui/windows/charcreatedialog.cpp:198
+#: src/gui/windows/charcreatedialog.cpp:219
+#: src/gui/windows/charcreatedialog.cpp:238
+#: src/gui/windows/charcreatedialog.cpp:256 src/gui/windows/outfitwindow.cpp:66
msgid ">"
msgstr ">"
#. TRANSLATORS: char create dialog label
#: src/gui/windows/charcreatedialog.cpp:111
-#: src/gui/windows/charcreatedialog.cpp:601
+#: src/gui/windows/charcreatedialog.cpp:633
#, c-format
msgid "Please distribute %d points"
msgstr "请分发%d点数"
@@ -6316,71 +6339,71 @@ msgstr "请分发%d点数"
#. You may change this symbol if your language uses another.
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: outfits window button
-#: src/gui/windows/charcreatedialog.cpp:201
-#: src/gui/windows/charcreatedialog.cpp:212
-#: src/gui/windows/charcreatedialog.cpp:223
-#: src/gui/windows/charcreatedialog.cpp:233 src/gui/windows/outfitwindow.cpp:64
+#: src/gui/windows/charcreatedialog.cpp:206
+#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:244
+#: src/gui/windows/charcreatedialog.cpp:262 src/gui/windows/outfitwindow.cpp:64
msgid "<"
msgstr "<"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:203
+#: src/gui/windows/charcreatedialog.cpp:211
msgid "Hair color:"
msgstr "头发颜色:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:214
+#: src/gui/windows/charcreatedialog.cpp:230
msgid "Hair style:"
msgstr "发型:"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:225
+#: src/gui/windows/charcreatedialog.cpp:249
msgid "Race:"
msgstr ""
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:235
+#: src/gui/windows/charcreatedialog.cpp:267
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:253 src/gui/windows/socialwindow.cpp:70
+#: src/gui/windows/charcreatedialog.cpp:285 src/gui/windows/socialwindow.cpp:70
msgid "F"
msgstr ""
#. TRANSLATORS: one char size male character gender
-#: src/gui/windows/charcreatedialog.cpp:259
-#: src/gui/windows/charcreatedialog.cpp:266
-#: src/gui/windows/charcreatedialog.cpp:274
+#: src/gui/windows/charcreatedialog.cpp:291
+#: src/gui/windows/charcreatedialog.cpp:298
+#: src/gui/windows/charcreatedialog.cpp:306
msgid "M"
msgstr ""
#. TRANSLATORS: one char size other character gender
#. TRANSLATORS: inventory outfits button
-#: src/gui/windows/charcreatedialog.cpp:261
-#: src/gui/windows/charcreatedialog.cpp:278
-#: src/gui/windows/inventorywindow.cpp:227
+#: src/gui/windows/charcreatedialog.cpp:293
+#: src/gui/windows/charcreatedialog.cpp:310
+#: src/gui/windows/inventorywindow.cpp:236
msgid "O"
msgstr ""
#. TRANSLATORS: one char size unknown character gender
-#: src/gui/windows/charcreatedialog.cpp:268
+#: src/gui/windows/charcreatedialog.cpp:300
msgid "U"
msgstr ""
#. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:475
+#: src/gui/windows/charcreatedialog.cpp:507
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字需要至少4个字符."
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:591
+#: src/gui/windows/charcreatedialog.cpp:623
msgid "Character stats OK"
msgstr "角色状态可以"
#. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:607
+#: src/gui/windows/charcreatedialog.cpp:639
#, c-format
msgid "Please remove %d points"
msgstr "请删除%d点数"
@@ -6407,36 +6430,37 @@ msgid "Switch"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:76
msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:619
+#: src/gui/windows/charselectdialog.cpp:79
+#: src/gui/windows/charselectdialog.cpp:644
#: src/gui/windows/updaterwindow.cpp:196
msgid "Play"
msgstr "开始"
+#. TRANSLATORS: change pincode button
+#: src/gui/windows/charselectdialog.cpp:128
+#, fuzzy
+msgid "Change pin"
+msgstr "切换登陆"
+
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:149
+#: src/gui/windows/charselectdialog.cpp:165
#, c-format
msgid "Account %s"
msgstr ""
-#. TRANSLATORS: pin code dialog header.
-#: src/gui/windows/charselectdialog.cpp:179
-msgid "Please set new pincode"
-msgstr ""
-
#. TRANSLATORS: character rename dialog header.
-#: src/gui/windows/charselectdialog.cpp:232
+#: src/gui/windows/charselectdialog.cpp:239
msgid "Please enter new name"
msgstr ""
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:257
+#: src/gui/windows/charselectdialog.cpp:264
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -6447,27 +6471,27 @@ msgid ""
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/charselectdialog.cpp:315
+#: src/gui/windows/charselectdialog.cpp:328
msgid "Incorrect password"
msgstr "不正确的密码"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:466
+#: src/gui/windows/charselectdialog.cpp:491
msgid "Enter your email for deleting character"
msgstr ""
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:468
+#: src/gui/windows/charselectdialog.cpp:493
msgid "Enter email:"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:476
+#: src/gui/windows/charselectdialog.cpp:501
msgid "Enter password for deleting character"
msgstr "删除字符输入的密码"
#. TRANSLATORS: email label.
-#: src/gui/windows/charselectdialog.cpp:478
+#: src/gui/windows/charselectdialog.cpp:503
msgid "Enter password:"
msgstr "输入密码:"
@@ -6509,7 +6533,7 @@ msgid "Antagonist"
msgstr ""
#. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
msgid "Yes"
msgstr "是"
@@ -6550,42 +6574,42 @@ msgid "Connect"
msgstr "连接"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:69
+#: src/gui/windows/editserverdialog.cpp:70
msgid "Use same ip"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:83
+#: src/gui/windows/editserverdialog.cpp:84
msgid "Address:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:85
+#: src/gui/windows/editserverdialog.cpp:86
msgid "Port:"
msgstr "端口:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:87
+#: src/gui/windows/editserverdialog.cpp:88
msgid "Server type:"
msgstr "服务器类型:"
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:89
+#: src/gui/windows/editserverdialog.cpp:90
msgid "Description:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:91
+#: src/gui/windows/editserverdialog.cpp:92
msgid "Online list url:"
msgstr ""
#. TRANSLATORS: edit server dialog label
-#: src/gui/windows/editserverdialog.cpp:93
+#: src/gui/windows/editserverdialog.cpp:94
msgid "Packet version:"
msgstr ""
#. TRANSLATORS: edit server dialog error message
-#: src/gui/windows/editserverdialog.cpp:213
+#: src/gui/windows/editserverdialog.cpp:214
msgid "Please at least type both the address and the port of the server."
msgstr ""
@@ -6620,7 +6644,7 @@ msgstr ""
#. TRANSLATORS: unknown hosts group name
#. TRANSLATORS: unknown skills tab name
#. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:488
+#: src/gui/windows/equipmentwindow.cpp:675 src/gui/windows/serverdialog.cpp:496
#: src/gui/windows/skilldialog.cpp:147 src/resources/skill/skillinfo.cpp:125
msgid "Unknown"
msgstr ""
@@ -6655,7 +6679,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: inventory button
#: src/gui/windows/inventorywindow.cpp:208 src/gui/windows/outfitwindow.cpp:68
-#: src/resources/db/itemdb.cpp:694 src/resources/itemtypemapdata.h:45
+#: src/resources/db/itemdb.cpp:702 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
@@ -6666,93 +6690,93 @@ msgid "Equip"
msgstr "装备"
#. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:229
+#: src/gui/windows/inventorywindow.cpp:242
msgid "C"
msgstr ""
#. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:231
+#: src/gui/windows/inventorywindow.cpp:248
msgid "S"
msgstr ""
#. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:233
+#: src/gui/windows/inventorywindow.cpp:254
msgid "E"
msgstr ""
#. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1082
+#: src/gui/windows/inventorywindow.cpp:1128
msgid "Insert card request"
msgstr ""
#. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1084
+#: src/gui/windows/inventorywindow.cpp:1130
#, c-format
msgid "Insert %s into %s?"
msgstr ""
#. TRANSLATORS: item amount window button
-#: src/gui/windows/itemamountwindow.cpp:210
+#: src/gui/windows/itemamountwindow.cpp:227
msgid "All"
msgstr "全部"
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:267
+#: src/gui/windows/itemamountwindow.cpp:293
msgid "Select amount of items to trade."
msgstr "请选择交易的物品数量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:271
+#: src/gui/windows/itemamountwindow.cpp:297
msgid "Select amount of items to drop."
msgstr "请选择丢弃的物品数量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:275
+#: src/gui/windows/itemamountwindow.cpp:301
msgid "Select amount of items to store."
msgstr "请选择存储的物品数量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:279
+#: src/gui/windows/itemamountwindow.cpp:305
msgid "Select amount of items to send."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:283
+#: src/gui/windows/itemamountwindow.cpp:309
msgid "Select amount of items to craft."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:287
+#: src/gui/windows/itemamountwindow.cpp:313
msgid "Select amount of items to store to cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:291
+#: src/gui/windows/itemamountwindow.cpp:317
msgid "Select amount of items to retrieve."
msgstr "请选择取回的物品数量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:295
+#: src/gui/windows/itemamountwindow.cpp:321
msgid "Select amount of items to retrieve from cart."
msgstr ""
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:299
+#: src/gui/windows/itemamountwindow.cpp:325
msgid "Select amount of items to split."
msgstr "请选择你分离的物品的数量."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:303
+#: src/gui/windows/itemamountwindow.cpp:329
msgid "Add to buy shop."
msgstr "添加到购买商店."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:307
+#: src/gui/windows/itemamountwindow.cpp:333
msgid "Add to sell shop."
msgstr "添加到出售商店."
#. TRANSLATORS: amount window message
-#: src/gui/windows/itemamountwindow.cpp:311
+#: src/gui/windows/itemamountwindow.cpp:337
msgid "Unknown."
msgstr "未知."
@@ -6762,91 +6786,91 @@ msgid "Reset stats"
msgstr "复位统计"
#. TRANSLATORS: kill stats window button
-#: src/gui/windows/killstats.cpp:56
+#: src/gui/windows/killstats.cpp:57
msgid "Reset timer"
msgstr "复位定时器"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:61 src/gui/windows/killstats.cpp:177
-#: src/gui/windows/killstats.cpp:291 src/gui/windows/killstats.cpp:461
+#: src/gui/windows/killstats.cpp:63 src/gui/windows/killstats.cpp:179
+#: src/gui/windows/killstats.cpp:293 src/gui/windows/killstats.cpp:463
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:64 src/gui/windows/killstats.cpp:179
-#: src/gui/windows/killstats.cpp:268 src/gui/windows/killstats.cpp:283
-#: src/gui/windows/killstats.cpp:463
+#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:181
+#: src/gui/windows/killstats.cpp:270 src/gui/windows/killstats.cpp:285
+#: src/gui/windows/killstats.cpp:465
#, c-format
msgid "Avg Exp: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:66 src/gui/windows/killstats.cpp:182
-#: src/gui/windows/killstats.cpp:273 src/gui/windows/killstats.cpp:287
-#: src/gui/windows/killstats.cpp:466
+#: src/gui/windows/killstats.cpp:68 src/gui/windows/killstats.cpp:184
+#: src/gui/windows/killstats.cpp:275 src/gui/windows/killstats.cpp:289
+#: src/gui/windows/killstats.cpp:468
#, c-format
msgid "No. of avg mob to next level: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:69 src/gui/windows/killstats.cpp:193
-#: src/gui/windows/killstats.cpp:296 src/gui/windows/killstats.cpp:469
+#: src/gui/windows/killstats.cpp:71 src/gui/windows/killstats.cpp:195
+#: src/gui/windows/killstats.cpp:298 src/gui/windows/killstats.cpp:471
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:73 src/gui/windows/killstats.cpp:78
-#: src/gui/windows/killstats.cpp:83 src/gui/windows/killstats.cpp:367
-#: src/gui/windows/killstats.cpp:389 src/gui/windows/killstats.cpp:412
+#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
+#: src/gui/windows/killstats.cpp:85 src/gui/windows/killstats.cpp:369
+#: src/gui/windows/killstats.cpp:391 src/gui/windows/killstats.cpp:414
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
-#: src/gui/windows/killstats.cpp:75 src/gui/windows/killstats.cpp:80
-#: src/gui/windows/killstats.cpp:86
+#: src/gui/windows/killstats.cpp:77 src/gui/windows/killstats.cpp:82
+#: src/gui/windows/killstats.cpp:88
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:89 src/gui/windows/killstats.cpp:302
+#: src/gui/windows/killstats.cpp:91 src/gui/windows/killstats.cpp:304
msgid "Last kill exp:"
msgstr "最后EXP:"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:122 src/gui/windows/killstats.cpp:246
+#: src/gui/windows/killstats.cpp:124 src/gui/windows/killstats.cpp:248
#, c-format
msgid "Level: %d at %f%%"
msgstr "等级:%d 在 %f%%"
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:131 src/gui/windows/killstats.cpp:255
+#: src/gui/windows/killstats.cpp:133 src/gui/windows/killstats.cpp:257
#, c-format
msgid "Exp: %s/%s Left: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:137 src/gui/windows/killstats.cpp:263
-#: src/gui/windows/killstats.cpp:278
+#: src/gui/windows/killstats.cpp:139 src/gui/windows/killstats.cpp:265
+#: src/gui/windows/killstats.cpp:280
#, c-format
msgid "1%% = %s exp, avg mob for 1%%: %s"
msgstr ""
#. TRANSLATORS: kill stats window label
-#: src/gui/windows/killstats.cpp:375 src/gui/windows/killstats.cpp:385
-#: src/gui/windows/killstats.cpp:398 src/gui/windows/killstats.cpp:407
-#: src/gui/windows/killstats.cpp:420 src/gui/windows/killstats.cpp:429
+#: src/gui/windows/killstats.cpp:377 src/gui/windows/killstats.cpp:387
+#: src/gui/windows/killstats.cpp:400 src/gui/windows/killstats.cpp:409
+#: src/gui/windows/killstats.cpp:422 src/gui/windows/killstats.cpp:431
#, c-format
msgid " Time for next level: %s"
msgstr ""
#. TRANSLATORS: login dialog name
#. TRANSLATORS: login dialog button
-#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:88
+#: src/gui/windows/logindialog.cpp:69 src/gui/windows/logindialog.cpp:89
msgid "Login"
msgstr "登录"
@@ -6869,29 +6893,29 @@ msgstr "更改服务器"
#. TRANSLATORS: register dialog name
#. TRANSLATORS: register dialog. button.
#. TRANSLATORS: server info comment
-#: src/gui/windows/logindialog.cpp:90 src/gui/windows/registerdialog.cpp:53
+#: src/gui/windows/logindialog.cpp:92 src/gui/windows/registerdialog.cpp:53
#: src/gui/windows/registerdialog.cpp:63
#: src/gui/windows/serverinfowindow.cpp:128
msgid "Register"
msgstr "注册"
#. TRANSLATORS: login dialog checkbox
-#: src/gui/windows/logindialog.cpp:92
+#: src/gui/windows/logindialog.cpp:95
msgid "Custom update host"
msgstr "自定义更新主机"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:112
+#: src/gui/windows/logindialog.cpp:115
msgid "Server:"
msgstr "服务器:"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:254
+#: src/gui/windows/logindialog.cpp:257
msgid "Open register url"
msgstr ""
#. TRANSLATORS: update hosts group default name
-#: src/gui/windows/logindialog.cpp:404
+#: src/gui/windows/logindialog.cpp:407
msgid "default updates"
msgstr ""
@@ -6912,14 +6936,14 @@ msgstr "至:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:76
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:113
-#: src/gui/windows/mailviewwindow.cpp:266
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:115
+#: src/gui/windows/mailviewwindow.cpp:275
msgid "Money:"
msgstr ""
@@ -6930,7 +6954,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:77
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:79
msgid "Message:"
msgstr ""
@@ -6954,22 +6978,22 @@ msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:65
+#: src/gui/windows/mailviewwindow.cpp:67
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:67
+#: src/gui/windows/mailviewwindow.cpp:69
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:71
+#: src/gui/windows/mailviewwindow.cpp:73
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/mailviewwindow.cpp:126
msgid "Get money"
msgstr ""
@@ -6979,24 +7003,29 @@ msgid "Refresh"
msgstr ""
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:70
+#: src/gui/windows/mailwindow.cpp:71
msgid "New"
msgstr ""
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
-#: src/gui/windows/mailwindow.cpp:75
+#: src/gui/windows/mailwindow.cpp:76
msgid "Return"
msgstr ""
#. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:78
+#: src/gui/windows/mailwindow.cpp:79
msgid "Open"
msgstr ""
+#. TRANSLATORS: expired mail message prefix
+#: src/gui/windows/mailwindow.cpp:200
+msgid "(expired)"
+msgstr ""
+
#. TRANSLATORS: status bar name
#: src/gui/windows/ministatuswindow.cpp:73
msgid "health bar"
@@ -7138,62 +7167,62 @@ msgid "Switch character"
msgstr "交换角色"
#. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:77
+#: src/gui/windows/registerdialog.cpp:79
msgid "Confirm:"
msgstr "确认:"
#. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:94
+#: src/gui/windows/registerdialog.cpp:96
msgid "Male"
msgstr "帅哥"
#. TRANSLATORS: register dialog. button.
-#: src/gui/windows/registerdialog.cpp:96
+#: src/gui/windows/registerdialog.cpp:98
msgid "Female"
msgstr "美女"
#. TRANSLATORS: register dialog. label.
-#: src/gui/windows/registerdialog.cpp:106
+#: src/gui/windows/registerdialog.cpp:108
msgid "Email:"
msgstr "电子邮件:"
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:182
+#: src/gui/windows/registerdialog.cpp:184
#, c-format
msgid "The username needs to be at least %u characters long."
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:191
+#: src/gui/windows/registerdialog.cpp:193
#, c-format
msgid "The username needs to be less than %u characters long."
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:200
+#: src/gui/windows/registerdialog.cpp:202
#, c-format
msgid "The password needs to be at least %u characters long."
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:209
+#: src/gui/windows/registerdialog.cpp:211
#, c-format
msgid "The password needs to be less than %u characters long."
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:217
+#: src/gui/windows/registerdialog.cpp:219
msgid "Passwords do not match."
msgstr "密码不一致."
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:224 src/net/ea/loginrecv.cpp:121
+#: src/gui/windows/registerdialog.cpp:226 src/net/ea/loginrecv.cpp:121
#: src/net/eathena/loginrecv.cpp:120
msgid "Incorrect email."
msgstr ""
#. TRANSLATORS: error message
-#: src/gui/windows/registerdialog.cpp:231
+#: src/gui/windows/registerdialog.cpp:233
msgid "Email too long."
msgstr ""
@@ -7203,48 +7232,53 @@ msgid "Choose Your Server"
msgstr "选择您的服务器"
#. TRANSLATORS: servers dialog button
-#: src/gui/windows/serverdialog.cpp:118
+#: src/gui/windows/serverdialog.cpp:120
msgid "Load"
msgstr "负载"
#. TRANSLATORS: servers dialog name
-#: src/gui/windows/serverdialog.cpp:132
+#: src/gui/windows/serverdialog.cpp:134
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "选择你的服务器***安全模式***"
+#: src/gui/windows/serverdialog.cpp:139
+#, fuzzy
+msgid "Choose Your Server *** SOFTWARE RENDER MODE ***"
+msgstr "选择你的服务器***安全模式***"
+
#. TRANSLATORS: servers dialog checkbox
-#: src/gui/windows/serverdialog.cpp:141
+#: src/gui/windows/serverdialog.cpp:149
msgid "Use same ip for game sub servers"
msgstr "游戏分服务器使用相同的IP"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:427
+#: src/gui/windows/serverdialog.cpp:435
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "下载服务器列表...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:433
+#: src/gui/windows/serverdialog.cpp:441
msgid "Waiting for server..."
msgstr "等待服务器..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:438
+#: src/gui/windows/serverdialog.cpp:446
msgid "Preparing download"
msgstr "准备下载"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:443
+#: src/gui/windows/serverdialog.cpp:451
msgid "Error retreiving server list!"
msgstr "恢复服务器列表错误!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:609
+#: src/gui/windows/serverdialog.cpp:617
msgid "requires a newer version"
msgstr "需要较新版本"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:614
+#: src/gui/windows/serverdialog.cpp:622
#, c-format
msgid "requires v%s"
msgstr "需要 v%s"
@@ -7302,72 +7336,72 @@ msgid "Reset Windows"
msgstr "重置窗口"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1141
+#: src/gui/windows/shopwindow.cpp:106 src/gui/windows/shopwindow.cpp:1153
msgid "Personal Shop"
msgstr "个人商店"
#. TRANSLATORS: shop window button
#. TRANSLATORS: publish shop button
-#: src/gui/windows/shopwindow.cpp:195 src/gui/windows/shopwindow.cpp:447
-#: src/gui/windows/shopwindow.cpp:472
+#: src/gui/windows/shopwindow.cpp:196 src/gui/windows/shopwindow.cpp:459
+#: src/gui/windows/shopwindow.cpp:484
msgid "Publish"
msgstr ""
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:204
+#: src/gui/windows/shopwindow.cpp:213
msgid "Announce"
msgstr "公布"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:206
+#: src/gui/windows/shopwindow.cpp:218
msgid "Show links in announce"
msgstr "显示在公布的联系"
#. TRANSLATORS: shop rename dialog title
-#: src/gui/windows/shopwindow.cpp:376
+#: src/gui/windows/shopwindow.cpp:388
msgid "Please enter new shop name"
msgstr ""
#. TRANSLATORS: unpublish shop button
-#: src/gui/windows/shopwindow.cpp:442 src/gui/windows/shopwindow.cpp:467
+#: src/gui/windows/shopwindow.cpp:454 src/gui/windows/shopwindow.cpp:479
msgid "Unpublish"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:939
+#: src/gui/windows/shopwindow.cpp:951
msgid "error: player busy"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:988
+#: src/gui/windows/shopwindow.cpp:1000
msgid "error: Can't sell this item"
msgstr ""
#. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:1000
+#: src/gui/windows/shopwindow.cpp:1012
msgid "error: Can't buy this item"
msgstr ""
#. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1020
+#: src/gui/windows/shopwindow.cpp:1032
#, c-format
msgid "%s wants to buy %s do you accept?"
msgstr ""
#. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:1027
+#: src/gui/windows/shopwindow.cpp:1039
#, c-format
msgid "%s wants to sell %s do you accept?"
msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1034 src/net/ea/traderecv.cpp:165
+#: src/gui/windows/shopwindow.cpp:1046 src/net/ea/traderecv.cpp:165
msgid "Request for Trade"
msgstr "请求交易"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1146
+#: src/gui/windows/shopwindow.cpp:1158
#, c-format
msgid "Personal Shop - %s"
msgstr ""
@@ -7384,46 +7418,46 @@ msgid "Skill points available: %d"
msgstr "技能点: %d个"
#. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:374
+#: src/gui/windows/skilldialog.cpp:399
#, c-format
msgid "Skill Set %d"
msgstr ""
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:487
+#: src/gui/windows/skilldialog.cpp:512
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
#. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:539
+#: src/gui/windows/skilldialog.cpp:564
#, c-format
msgid "Skill %u"
msgstr ""
#. TRANSLATORS: skills dialog. skill level
#. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:758 src/resources/skill/skillinfo.cpp:108
+#: src/gui/windows/skilldialog.cpp:783 src/resources/skill/skillinfo.cpp:108
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
#. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:765
+#: src/gui/windows/skilldialog.cpp:790
#, c-format
msgid "Failed skill: %s"
msgstr ""
#. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:1139 src/gui/windows/skilldialog.cpp:1205
-#: src/gui/windows/skilldialog.cpp:1326
+#: src/gui/windows/skilldialog.cpp:1164 src/gui/windows/skilldialog.cpp:1230
+#: src/gui/windows/skilldialog.cpp:1351
#, c-format
msgid "Add text to skill %s"
msgstr ""
#. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:1142 src/gui/windows/skilldialog.cpp:1208
-#: src/gui/windows/skilldialog.cpp:1329
+#: src/gui/windows/skilldialog.cpp:1167 src/gui/windows/skilldialog.cpp:1233
+#: src/gui/windows/skilldialog.cpp:1354
msgid "Text: "
msgstr ""
@@ -7633,33 +7667,33 @@ msgid "Trade: You"
msgstr "交易: 你"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:194
+#: src/gui/windows/tradewindow.cpp:87 src/gui/windows/tradewindow.cpp:196
#, c-format
msgid "You get %s"
msgstr "你得到%s"
#. TRANSLATORS: trade window money change button
-#: src/gui/windows/tradewindow.cpp:92
+#: src/gui/windows/tradewindow.cpp:93
msgid "Change"
msgstr "改变"
#. TRANSLATORS: trade window money label
-#: src/gui/windows/tradewindow.cpp:138
+#: src/gui/windows/tradewindow.cpp:140
msgid "You give:"
msgstr "你给予:"
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:446
+#: src/gui/windows/tradewindow.cpp:448
msgid "You don't have enough money."
msgstr "你没有足够的钱币."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:537
+#: src/gui/windows/tradewindow.cpp:539
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
#. TRANSLATORS: trade error
-#: src/gui/windows/tradewindow.cpp:552
+#: src/gui/windows/tradewindow.cpp:554
msgid "Failed adding item. You can not trade equipped items."
msgstr ""
@@ -7734,7 +7768,7 @@ msgid "Change Login"
msgstr "切换登陆"
#. TRANSLATORS: world dialog button
-#: src/gui/windows/worldselectdialog.cpp:55
+#: src/gui/windows/worldselectdialog.cpp:56
msgid "Choose World"
msgstr "选择世界"
@@ -8909,9 +8943,8 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/input/pages/windows.cpp:208
-#, fuzzy
msgid "Clan window"
-msgstr "聊天窗口"
+msgstr ""
#. TRANSLATORS: input action name
#: src/input/pages/windows.cpp:220
@@ -9122,33 +9155,33 @@ msgstr "连接到服务器终止. "
#. TRANSLATORS: error message
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:411
-#: src/net/eathena/charserverrecv.cpp:459
+#: src/net/eathena/charserverrecv.cpp:428
+#: src/net/eathena/charserverrecv.cpp:476
msgid "Character rename error."
msgstr ""
#. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:434
+#: src/net/eathena/charserverrecv.cpp:451
msgid "Character renamed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:450
+#: src/net/eathena/charserverrecv.cpp:467
msgid "Rename not allowed."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:454
+#: src/net/eathena/charserverrecv.cpp:471
msgid "New name is not set."
msgstr ""
#. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:463
+#: src/net/eathena/charserverrecv.cpp:480
msgid "Character not found."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:497 src/net/tmwa/charserverrecv.cpp:293
+#: src/net/eathena/charserverrecv.cpp:514 src/net/tmwa/charserverrecv.cpp:293
msgid "Failed to delete character."
msgstr "删除角色失败."
@@ -9178,13 +9211,13 @@ msgid "Work in progress."
msgstr ""
#. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:344
+#: src/net/eathena/chatrecv.cpp:365
#, c-format
msgid "Message could not be sent, channel %s is not exists."
msgstr ""
#. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:470
+#: src/net/eathena/chatrecv.cpp:491
#, c-format
msgid "Can't open channel. Channel %s is not exists."
msgstr ""
@@ -9201,7 +9234,7 @@ msgid "Do you accept %s and %s as parents?"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:218 src/net/tmwa/generalhandler.cpp:220
+#: src/net/eathena/generalhandler.cpp:221 src/net/tmwa/generalhandler.cpp:223
msgid "Got disconnected from server!"
msgstr "和服务器失去连接!"
@@ -9457,108 +9490,108 @@ msgid "You were killed by unknown source."
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:303
+#: src/net/eathena/skillrecv.cpp:304
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:316
+#: src/net/eathena/skillrecv.cpp:317
#, c-format
msgid "Unknown skill error: %d."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:325 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:326 src/net/tmwa/skillrecv.cpp:146
msgid "You have not yet reached a high enough lvl!"
msgstr "你还没有达到足够的等级!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:329 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:330 src/net/tmwa/skillrecv.cpp:150
msgid "Insufficient HP!"
msgstr "HP不足!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:333 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:334 src/net/tmwa/skillrecv.cpp:154
msgid "Insufficient SP!"
msgstr "SP不足!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:337 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:338 src/net/tmwa/skillrecv.cpp:158
msgid "You have no memos!"
msgstr "没有备忘录!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:341 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:342 src/net/tmwa/skillrecv.cpp:162
msgid "You cannot do that right now!"
msgstr "你无法办到!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:345 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:346 src/net/tmwa/skillrecv.cpp:166
msgid "Seems you need more money... ;-)"
msgstr "看起来需要更多金币... ;-)"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:349 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:350 src/net/tmwa/skillrecv.cpp:170
msgid "You cannot use this skill with that kind of weapon!"
msgstr "此武器无法用来使用此项技能!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:354 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:355 src/net/tmwa/skillrecv.cpp:175
msgid "You need another red gem!"
msgstr "你需要另一颗红宝石!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:358 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:359 src/net/tmwa/skillrecv.cpp:179
msgid "You need another blue gem!"
msgstr "你需要另一颗蓝宝石!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:362 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:363 src/net/tmwa/skillrecv.cpp:183
msgid "You're carrying to much to do this!"
msgstr "你已负重太多，无法办到!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:366
+#: src/net/eathena/skillrecv.cpp:367
msgid "Fail summon."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:370
+#: src/net/eathena/skillrecv.cpp:371
msgid "Need spirits."
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:380
+#: src/net/eathena/skillrecv.cpp:381
#, c-format
msgid "Need equipment %s."
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:386
+#: src/net/eathena/skillrecv.cpp:387
#, c-format
msgid "Need equipment %s and amount %d"
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:400
+#: src/net/eathena/skillrecv.cpp:401
#, c-format
msgid "Need item %s."
msgstr ""
#. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:406
+#: src/net/eathena/skillrecv.cpp:407
#, c-format
msgid "Need item %s and amount %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:415
+#: src/net/eathena/skillrecv.cpp:416
msgid "Skill failed!"
msgstr ""
#. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:433
+#: src/net/eathena/skillrecv.cpp:434
msgid "Select warp target"
msgstr ""
@@ -9666,8 +9699,53 @@ msgstr "无法偷取任何物品..."
msgid "Poison had no effect..."
msgstr "毒药无效..."
+#. TRANSLATORS: dialog caption
+#. TRANSLATORS: error header
+#: src/pincodemanager.cpp:78 src/pincodemanager.cpp:143
+#: src/pincodemanager.cpp:202
+msgid "Pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:80
+#, fuzzy
+msgid "Enter pincode"
+msgstr "输入密码:"
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:91 src/pincodemanager.cpp:127
+msgid "New pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:93 src/pincodemanager.cpp:173
+msgid "Enter new pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/pincodemanager.cpp:105 src/pincodemanager.cpp:171
+#: src/pincodemanager.cpp:185
+#, fuzzy
+msgid "Change pincode"
+msgstr "更改地图浏览模式"
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:107
+msgid "Enter old pincode"
+msgstr ""
+
+#. TRANSLATORS: dialog label
+#: src/pincodemanager.cpp:129 src/pincodemanager.cpp:187
+msgid "Confirm new pincode"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/pincodemanager.cpp:145 src/pincodemanager.cpp:204
+msgid "Wrong pincode confirmation!"
+msgstr ""
+
#. TRANSLATORS: theme tab quick button
-#: src/progs/dyecmd/client.cpp:558 src/progs/manaplus/client.cpp:915
+#: src/progs/dyecmd/client.cpp:561 src/progs/manaplus/client.cpp:919
msgid "About"
msgstr "关于"
@@ -9687,7 +9765,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: file uploaded message
-#: src/progs/manaplus/actions/actions.cpp:176
+#: src/progs/manaplus/actions/actions.cpp:175
msgid "File uploaded"
msgstr ""
@@ -9738,24 +9816,24 @@ msgid "Log uploaded to:"
msgstr ""
#. TRANSLATORS: last seen disabled warning
-#: src/progs/manaplus/actions/actions.cpp:1924
+#: src/progs/manaplus/actions/actions.cpp:1943
msgid ""
"Last seen disabled. Enable in players / collect players ID and seen log."
msgstr ""
#. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1945
+#: src/progs/manaplus/actions/actions.cpp:1964
msgid "You have never seen this nick."
msgstr ""
#. TRANSLATORS: last seen message
-#: src/progs/manaplus/actions/actions.cpp:1953
+#: src/progs/manaplus/actions/actions.cpp:1972
#, c-format
msgid "Last seen for %s: %s"
msgstr ""
#. TRANSLATORS: last seen error
-#: src/progs/manaplus/actions/actions.cpp:1964
+#: src/progs/manaplus/actions/actions.cpp:1983
msgid "You have not seen this nick before."
msgstr ""
@@ -10008,57 +10086,57 @@ msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1117
+#: src/progs/manaplus/client.cpp:1122
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1175 src/unittests/gui/windowmanager.cc:830
+#: src/progs/manaplus/client.cpp:1181 src/unittests/gui/windowmanager.cc:830
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1225
+#: src/progs/manaplus/client.cpp:1231
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1286
+#: src/progs/manaplus/client.cpp:1292
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1329
+#: src/progs/manaplus/client.cpp:1336
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1341
+#: src/progs/manaplus/client.cpp:1348
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/progs/manaplus/client.cpp:1436
+#: src/progs/manaplus/client.cpp:1443
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/progs/manaplus/client.cpp:1483
+#: src/progs/manaplus/client.cpp:1490
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/progs/manaplus/client.cpp:1485
+#: src/progs/manaplus/client.cpp:1492
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/progs/manaplus/client.cpp:1518
+#: src/progs/manaplus/client.cpp:1525
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/progs/manaplus/client.cpp:1520
+#: src/progs/manaplus/client.cpp:1527
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-28 10:19:28 +0000