Merge branch 'master' of gitorious.org:manaplus/manaplus

author: Reid <reidyaro@gmail.com> 2012-03-01 22:03:01 +0100
committer: Reid <reidyaro@gmail.com> 2012-03-01 22:03:01 +0100
commit: 490862919d79369112c75955a9c36ff8a081efd3 (patch)
tree: 6fe89466b9c53ba811f298174e6d787bbae71e09 /po/zh_TW.po
parent: dff814619d63496acd3c4e8730b828b5d4d931fb (diff)
parent: d873da3e8e57480016596f714845c1bc7e712e68 (diff)
download: manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz
manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2
manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz
manaplus-490862919d79369112c75955a9c36ff8a081efd3.zip
1 files changed, 1899 insertions, 1633 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6b621f8f2..be125b2f3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "顯示"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗！"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "不明指令"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "傳送密語失敗"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr "不能以名稱 \"%s\" 創建一個密語標籤! 該名稱已存在或對方是你."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "要求參加頻道 %s"
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "漏掉隊伍名稱。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "關閉密語"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切換聊天"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "切換聊天"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易要求"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "接受收到的交易要求"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "名字"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "說話"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "重設"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "增加"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "減少"
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "取消"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密碼："
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "新增角色"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "名字："
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分配%d點數"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字至少需要4個字元"
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "確認刪除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "帳號與角色管理"
 
@@ -595,120 +630,122 @@ msgstr "帳號與角色管理"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "取消註冊"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對%s竊竊私語：%s"
@@ -721,506 +758,551 @@ msgstr "是"
 msgid "No"
 msgstr "否"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "端口(port):"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "裝備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "卸下裝備"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "物品攔"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "欄位:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "物品攔"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "欄位:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "裝備"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "重量:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "寄放"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "取回"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "請選擇交易的物品數量"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "請選擇丟棄的物品數量"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "選擇要儲存的物品數量。"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "選擇要取回的物品數量。"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "請選擇你要分離的物品數量"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "等待伺服器中"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "確認"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "存至:"
@@ -1233,345 +1315,382 @@ msgstr "傳送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳送的發件人或信息無效。"
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "交換伺服器"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "交換角色"
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "端口(port):"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "增加"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "請輸入伺服氣得IP地址和Port"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "音效"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "音效"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "音效音量"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "音樂音量"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "顏色"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分頁中"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "這是顏色看起來的樣子"
@@ -1856,41 +2014,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "重置視窗"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "矯正"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "啟用搖桿"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "搖桿"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "停止"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "旋轉手柄"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1912,360 +2070,460 @@ msgstr "預設"
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按鍵衝突。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "玩家"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "可見的名稱"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "不理"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "允許交易"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "允許密語"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "字型大小"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "請重新啟動您的客戶端讓變更生效。"
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "沒有文字"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "文字"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "有聊天泡泡,沒名字"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "聊天泡泡加名字"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "關閉"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "粒子效果"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "顯示撿拾通知"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "聊天中"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "同粒子設定"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "顯示"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "置頂文字"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Gui 透明度"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "環境效果"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "變更會在地圖改變後生效。"
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Gui 透明度"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "沒有文字"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "文字"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "有聊天泡泡,沒名字"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "聊天泡泡加名字"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "置頂文字"
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "關閉"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "環境效果"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "粒子效果"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "增加"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "要求交易"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "升級"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "公會"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "隊伍"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "收到派對邀請,但而有另一個存在."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你參加他們的派對."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你參加 %s 派對."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "接受派對邀請"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "體力 :"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "經驗值:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "魔力:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "職業：%d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "職業:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,60 +3137,60 @@ msgstr "已同意。請稍候..."
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "你沒有足夠的金錢."
+
+#: src/gui/tradewindow.cpp:454
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "你沒有足夠的金錢."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "名字：%s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程序不完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "已完成"
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "這個指令會讓 <nick> 成為頻道操作者。"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
@@ -3533,6 +3462,41 @@ msgstr "%s 主要公告："
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "右移"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "史萊姆吃掉妳了~~"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "停止攻擊"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "隱藏視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "坐下"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "啟用/停用交易"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "選擇確定"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物品捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "物品欄視窗"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "物品視窗"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "聊天視窗"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "物品捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "程式除錯視窗"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "表情捷徑鍵視窗"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "史萊姆吃掉妳了~~"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情捷徑鍵 %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "切換聊天"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "將聊天向上捲動"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "將聊天向下捲動"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "前一個聊天分頁"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "下一個聊天分頁"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "選擇確定"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "選項:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr "謝謝光臨."
 msgid "Unable to buy."
 msgstr "不能購買."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "資訊"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很遺憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "您不再是那麼有活力。"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "遊戲結束！"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "不，孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "您想要鑑定你的財產嗎？"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發現你的蹤跡..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "灰飛煙滅了。"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你又被幹掉啦!!!躺在地上一次又一次!!"
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "交易已取消。"
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "交易已完成。"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "力量"
 
@@ -4983,7 +5247,7 @@ msgstr "力量"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "敏捷"
 
@@ -4992,7 +5256,7 @@ msgstr "敏捷"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "閃躲"
 
@@ -5001,7 +5265,7 @@ msgstr "閃躲"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "體力"
 
@@ -5010,7 +5274,7 @@ msgstr "體力"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "智力"
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "力量 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "敏捷 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "體力 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智力 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "幸運  %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "幸運"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s 不在您的隊伍中！"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "未知物品"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "攻擊 %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "防禦 %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "體力%+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "魔力%+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "不明的物品"
-
-
author	Reid <reidyaro@gmail.com>	2012-03-01 22:03:01 +0100
committer	Reid <reidyaro@gmail.com>	2012-03-01 22:03:01 +0100
commit	490862919d79369112c75955a9c36ff8a081efd3 (patch)
tree	6fe89466b9c53ba811f298174e6d787bbae71e09 /po/zh_TW.po
parent	dff814619d63496acd3c4e8730b828b5d4d931fb (diff)
parent	d873da3e8e57480016596f714845c1bc7e712e68 (diff)
download	manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.gz manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2 manaplus-490862919d79369112c75955a9c36ff8a081efd3.tar.xz manaplus-490862919d79369112c75955a9c36ff8a081efd3.zip