1 files changed, 52 insertions, 50 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9309ea952..6d9cc0147 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-22 17:50+0300\n"
-"PO-Revision-Date: 2014-10-23 10:02+0000\n"
+"POT-Creation-Date: 2014-10-24 12:58+0300\n"
+"PO-Revision-Date: 2014-10-25 10:00+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -53,8 +53,8 @@ msgstr ""
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
 #: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:83
 #: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
-#: src/net/eathena/charserverhandler.cpp:540
-#: src/net/eathena/charserverhandler.cpp:570
+#: src/net/eathena/charserverhandler.cpp:541
+#: src/net/eathena/charserverhandler.cpp:571
 msgid "OK"
 msgstr "確定"
 
@@ -347,7 +347,7 @@ msgstr ""
 
 #. TRANSLATORS: pickup error message
 #: src/being/localplayer.cpp:849
-msgid "You cant pickup this amount of items."
+msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
@@ -550,8 +550,8 @@ msgstr ""
 #: src/gui/windows/registerdialog.cpp:243
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
-#: src/net/eathena/charserverhandler.cpp:523
-#: src/net/eathena/charserverhandler.cpp:525
+#: src/net/eathena/charserverhandler.cpp:524
+#: src/net/eathena/charserverhandler.cpp:526
 msgid "Error"
 msgstr "錯誤"
 
@@ -1537,7 +1537,7 @@ msgstr "交易"
 #: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:274
 #: src/gui/popups/popupmenu.cpp:769 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:362 src/net/tmwa/generalhandler.cpp:326
+#: src/net/eathena/generalhandler.cpp:362 src/net/tmwa/generalhandler.cpp:328
 msgid "Attack"
 msgstr "攻擊"
 
@@ -5268,8 +5268,8 @@ msgstr "開始"
 #. TRANSLATORS: info message
 #: src/gui/windows/charselectdialog.cpp:80
 #: src/net/ea/charserverhandler.cpp:160
-#: src/net/eathena/charserverhandler.cpp:538
-#: src/net/eathena/charserverhandler.cpp:568
+#: src/net/eathena/charserverhandler.cpp:539
+#: src/net/eathena/charserverhandler.cpp:569
 msgid "Info"
 msgstr "資訊"
 
@@ -7716,27 +7716,27 @@ msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:523
-#: src/net/eathena/charserverhandler.cpp:560
+#: src/net/eathena/charserverhandler.cpp:524
+#: src/net/eathena/charserverhandler.cpp:561
 msgid "Character rename error."
 msgstr ""
 
-#: src/net/eathena/charserverhandler.cpp:538
+#: src/net/eathena/charserverhandler.cpp:539
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:551
+#: src/net/eathena/charserverhandler.cpp:552
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:555
+#: src/net/eathena/charserverhandler.cpp:556
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:564
+#: src/net/eathena/charserverhandler.cpp:565
 msgid "Character not found."
 msgstr ""
 
@@ -7783,27 +7783,27 @@ msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:163 src/net/tmwa/generalhandler.cpp:164
+#: src/net/eathena/generalhandler.cpp:163 src/net/tmwa/generalhandler.cpp:173
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:166 src/net/tmwa/generalhandler.cpp:168
+#: src/net/eathena/generalhandler.cpp:166 src/net/tmwa/generalhandler.cpp:177
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:174
+#: src/net/eathena/generalhandler.cpp:171 src/net/tmwa/generalhandler.cpp:183
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:180
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:189
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:185
+#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:194
 msgid "Speed hack detected."
 msgstr ""
 
@@ -7816,7 +7816,7 @@ msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:189
+#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:198
 msgid "Duplicated login."
 msgstr ""
 
@@ -7897,94 +7897,94 @@ msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:193
+#: src/net/eathena/generalhandler.cpp:251 src/net/tmwa/generalhandler.cpp:202
 msgid "Unknown connection error."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:329 src/net/tmwa/generalhandler.cpp:285
+#: src/net/eathena/generalhandler.cpp:329 src/net/tmwa/generalhandler.cpp:287
 msgid "Got disconnected from server!"
 msgstr "和伺服器失去連線!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:313
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:315
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:355 src/net/tmwa/generalhandler.cpp:315
+#: src/net/eathena/generalhandler.cpp:355 src/net/tmwa/generalhandler.cpp:317
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:317
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:319
 msgid "Vitality"
 msgstr "體力"
 
-#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:320
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:322
 msgid "Intelligence"
 msgstr "智力"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:322
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:324
 msgid "Dexterity"
 msgstr "閃躲"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:324
+#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:326
 msgid "Luck"
 msgstr "幸運"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:328
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:330
 msgid "Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:364 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:364 src/net/tmwa/generalhandler.cpp:332
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:332
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:334
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:335
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:337
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:340
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:371 src/net/tmwa/generalhandler.cpp:341
+#: src/net/eathena/generalhandler.cpp:371 src/net/tmwa/generalhandler.cpp:343
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:372 src/net/tmwa/generalhandler.cpp:343
+#: src/net/eathena/generalhandler.cpp:372 src/net/tmwa/generalhandler.cpp:345
 msgid "Attack Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:373 src/net/tmwa/generalhandler.cpp:345
+#: src/net/eathena/generalhandler.cpp:373 src/net/tmwa/generalhandler.cpp:347
 msgid "Walk Delay"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:374 src/net/tmwa/generalhandler.cpp:347
+#: src/net/eathena/generalhandler.cpp:374 src/net/tmwa/generalhandler.cpp:349
 msgid "Attack Range"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:375 src/net/tmwa/generalhandler.cpp:349
+#: src/net/eathena/generalhandler.cpp:375 src/net/tmwa/generalhandler.cpp:351
 msgid "Damage per sec."
 msgstr ""
 
@@ -8282,12 +8282,12 @@ msgstr "不能購買."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:47
-msgid "Unable to buy. You not have enought money."
+msgid "Unable to buy. You don't have enough money."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:51
-msgid "Unable to buy. You overweight."
+msgid "Unable to buy. It is too heavy."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8333,7 +8333,7 @@ msgstr "公會已成立."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:87
-msgid "You are already in guild."
+msgid "You are already in a guild."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8410,7 +8410,7 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:147
-msgid "Could not create party."
+msgid "Couldn't create party."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8425,17 +8425,17 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:159
-msgid "You cant left party on this map."
+msgid "You can't leave party on this map."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:163
-msgid "You was kicked from party."
+msgid "You were kicked from party."
 msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:167
-msgid "You cant be kicked from party on this map."
+msgid "You can't be kicked from party on this map."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8483,7 +8483,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:223 src/resources/notifications.h:231
 #, c-format
-msgid "%s cant be kicked from party on this map."
+msgid "%s can't be kicked from party on this map."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8718,7 +8718,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:407
 #, c-format
-msgid "You cant feed homunculus, because not have %s."
+msgid "You can't feed homunculus, because you don't have %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
@@ -8738,7 +8738,9 @@ msgstr ""
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:423
-msgid "Withdraw failed. Probably you not have money in bank for withdraw."
+msgid ""
+"Withdraw failed. You probably don't have this amount of money in the bank "
+"right now."
 msgstr ""
 
 #. TRANSLATORS: chat option changed message