1 files changed, 240 insertions, 230 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 883bab315..dc5ad10fa 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-23 00:52+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-28 03:37+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/akaras/manaplus/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -52,11 +52,10 @@ msgstr ""
 #: src/gui/windows/itemamountwindow.cpp:179 src/gui/windows/quitdialog.cpp:66
 #: src/gui/windows/registerdialog.cpp:241 src/gui/windows/socialwindow.cpp:524
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
-#: src/net/ea/charserverhandler.cpp:145 src/net/ea/charserverhandler.cpp:170
-#: src/net/ea/gamehandler.cpp:85 src/net/eathena/charserverhandler.cpp:614
-#: src/net/eathena/charserverhandler.cpp:649
-#: src/net/eathena/charserverhandler.cpp:685
-#: src/net/tmwa/charserverhandler.cpp:477
+#: src/net/ea/charserverrecv.cpp:110 src/net/ea/charserverrecv.cpp:136
+#: src/net/ea/gamerecv.cpp:72 src/net/eathena/charserverrecv.cpp:377
+#: src/net/eathena/charserverrecv.cpp:412
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:283
 msgid "OK"
 msgstr "OK"
 
@@ -258,7 +257,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -543,12 +542,10 @@ msgstr "Changing game servers"
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
-#: src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:142
-#: src/net/eathena/charserverhandler.cpp:589
-#: src/net/eathena/charserverhandler.cpp:593
-#: src/net/eathena/charserverhandler.cpp:681
-#: src/net/tmwa/charserverhandler.cpp:473
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:107
+#: src/net/eathena/charserverrecv.cpp:350
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:436 src/net/tmwa/charserverrecv.cpp:279
 msgid "Error"
 msgstr "Error"
 
@@ -1381,89 +1378,104 @@ msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:47
-msgid "Chinese (China)"
+msgid "Catalan"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:49
-msgid "Czech"
+msgid "Chinese (China)"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-msgid "English"
+msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
-msgid "Finnish"
+msgid "Czech"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:55
-msgid "French"
+msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:57
-msgid "German"
+msgid "English"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:59
-msgid "Indonesian"
+msgid "Finnish"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:61
-msgid "Italian"
+msgid "French"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:63
-msgid "Polish"
+msgid "German"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:65
-msgid "Japanese"
+msgid "Indonesian"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:67
-msgid "Dutch (Belgium/Flemish)"
+msgid "Italian"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:69
-msgid "Portuguese"
+msgid "Japanese"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:71
-msgid "Portuguese (Brazilian)"
+msgid "Polish"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:73
-msgid "Russian"
+msgid "Portuguese"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:75
-msgid "Spanish (Castilian)"
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:77
-msgid "Swedish (Sweden)"
+msgid "Russian"
 msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:79
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:81
+msgid "Swedish (Sweden)"
+msgstr ""
+
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:83
 msgid "Turkish"
 msgstr ""
 
+#. TRANSLATORS: language
+#: src/gui/models/langlistmodel.h:85
+msgid "Ukraine"
+msgstr ""
+
 #. TRANSLATORS: magic school
 #: src/gui/models/magicschoolmodel.h:35
 msgid "General Magic"
@@ -1737,8 +1749,8 @@ msgstr "Trade"
 #. TRANSLATORS: player stat
 #: src/gui/popups/popupmenu.cpp:164 src/gui/popups/popupmenu.cpp:286
 #: src/gui/popups/popupmenu.cpp:814 src/gui/widgets/skillinfo.cpp:109
-#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:396
-#: src/net/tmwa/generalhandler.cpp:359
+#: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:314
 msgid "Attack"
 msgstr "Attack"
 
@@ -3788,7 +3800,7 @@ msgstr ""
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
-"Note: frequent hilights are annoying - use it with caution."
+"Note: frequent highlights are annoying - use it with caution."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5740,10 +5752,9 @@ msgstr "Play"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79
-#: src/net/ea/charserverhandler.cpp:166
-#: src/net/eathena/charserverhandler.cpp:610
-#: src/net/eathena/charserverhandler.cpp:646
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
+#: src/net/eathena/charserverrecv.cpp:373
+#: src/net/eathena/charserverrecv.cpp:409
 msgid "Info"
 msgstr "Info"
 
@@ -5830,7 +5841,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/pethandler.cpp:173
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -8142,175 +8153,175 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:87
+#: src/net/ea/charserverrecv.cpp:52
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:92
+#: src/net/ea/charserverrecv.cpp:57
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:96
+#: src/net/ea/charserverrecv.cpp:61
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:112
+#: src/net/ea/charserverrecv.cpp:77
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:117 src/net/ea/loginhandler.cpp:249
-#: src/net/eathena/loginhandler.cpp:233
+#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
+#: src/net/eathena/loginrecv.cpp:102
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:121
+#: src/net/ea/charserverrecv.cpp:86
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:125
+#: src/net/ea/charserverrecv.cpp:90
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:129
+#: src/net/ea/charserverrecv.cpp:94
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:133
+#: src/net/ea/charserverrecv.cpp:98
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverhandler.cpp:137
+#: src/net/ea/charserverrecv.cpp:102
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverhandler.cpp:168
+#: src/net/ea/charserverrecv.cpp:134
 msgid "Character deleted."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:115
+#: src/net/ea/chatrecv.cpp:94
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:125
+#: src/net/ea/chatrecv.cpp:104
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/ea/chathandler.cpp:135
+#: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamehandler.cpp:81
+#: src/net/ea/gamerecv.cpp:68
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamehandler.cpp:83
+#: src/net/ea/gamerecv.cpp:70
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:121
+#: src/net/ea/guildrecv.cpp:115
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:124
+#: src/net/ea/guildrecv.cpp:118
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:127
+#: src/net/ea/guildrecv.cpp:121
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:130
+#: src/net/ea/guildrecv.cpp:124
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:133
+#: src/net/ea/guildrecv.cpp:127
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:136
+#: src/net/ea/guildrecv.cpp:130
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:139
+#: src/net/ea/guildrecv.cpp:133
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:142
+#: src/net/ea/guildrecv.cpp:136
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:145
+#: src/net/ea/guildrecv.cpp:139
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:209 src/net/eathena/loginhandler.cpp:188
+#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:213 src/net/eathena/loginhandler.cpp:192
+#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:218 src/net/eathena/loginhandler.cpp:197
+#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:222 src/net/eathena/loginhandler.cpp:201
+#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:226 src/net/eathena/loginhandler.cpp:205
+#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:231 src/net/eathena/loginhandler.cpp:210
+#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:235 src/net/eathena/loginhandler.cpp:214
+#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8318,28 +8329,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:241 src/net/eathena/loginhandler.cpp:223
+#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:245 src/net/eathena/loginhandler.cpp:228
+#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:253 src/net/eathena/loginhandler.cpp:238
+#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:257 src/net/eathena/loginhandler.cpp:243
+#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginhandler.cpp:261 src/net/eathena/loginhandler.cpp:247
-#: src/net/eathena/loginhandler.cpp:355 src/net/tmwa/loginhandler.cpp:255
+#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
+#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
 msgid "Unknown error."
 msgstr ""
 
@@ -8360,320 +8371,319 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:591
-#: src/net/eathena/charserverhandler.cpp:637
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:400
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverhandler.cpp:612
+#: src/net/eathena/charserverrecv.cpp:375
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:628
+#: src/net/eathena/charserverrecv.cpp:391
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:632
+#: src/net/eathena/charserverrecv.cpp:395
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:641
+#: src/net/eathena/charserverrecv.cpp:404
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverhandler.cpp:683
-#: src/net/tmwa/charserverhandler.cpp:475
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chathandler.cpp:487
+#: src/net/eathena/chatrecv.cpp:139
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chathandler.cpp:490
+#: src/net/eathena/chatrecv.cpp:142
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chathandler.cpp:493
+#: src/net/eathena/chatrecv.cpp:145
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chathandler.cpp:496
+#: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chathandler.cpp:499
+#: src/net/eathena/chatrecv.cpp:151
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chathandler.cpp:679
+#: src/net/eathena/chatrecv.cpp:331
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chathandler.cpp:825
+#: src/net/eathena/chatrecv.cpp:453
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:141
+#: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:143
+#: src/net/eathena/generalhandler.cpp:132 src/net/tmwa/generalhandler.cpp:142
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:134 src/net/tmwa/generalhandler.cpp:145
+#: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:144
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:135 src/net/tmwa/generalhandler.cpp:147
+#: src/net/eathena/generalhandler.cpp:134 src/net/tmwa/generalhandler.cpp:146
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:149
+#: src/net/eathena/generalhandler.cpp:135 src/net/tmwa/generalhandler.cpp:148
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:137 src/net/tmwa/generalhandler.cpp:151
+#: src/net/eathena/generalhandler.cpp:136 src/net/tmwa/generalhandler.cpp:150
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
+msgstr "Disconnected from server!"
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "Strength"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "Agility"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr "Vitality"
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr "Dexterity"
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr "Luck"
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
+msgstr ""
+
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:337
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
+msgstr ""
+
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
+#: src/net/eathena/generalrecv.cpp:114
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
+#: src/net/eathena/generalrecv.cpp:120
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
+#: src/net/eathena/generalrecv.cpp:123
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
+#: src/net/eathena/generalrecv.cpp:126
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
+#: src/net/eathena/generalrecv.cpp:129
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
+#: src/net/eathena/generalrecv.cpp:132
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
+#: src/net/eathena/generalrecv.cpp:135
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
+#: src/net/eathena/generalrecv.cpp:138
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
+#: src/net/eathena/generalrecv.cpp:142
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
+#: src/net/eathena/generalrecv.cpp:145
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:229
+#: src/net/eathena/generalrecv.cpp:148
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
+#: src/net/eathena/generalrecv.cpp:151
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
+#: src/net/eathena/generalrecv.cpp:154
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
+#: src/net/eathena/generalrecv.cpp:158
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
+#: src/net/eathena/generalrecv.cpp:161
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
+#: src/net/eathena/generalrecv.cpp:164
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
+#: src/net/eathena/generalrecv.cpp:167
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
+#: src/net/eathena/generalrecv.cpp:170
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
+#: src/net/eathena/generalrecv.cpp:173
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
+#: src/net/eathena/generalrecv.cpp:176
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
+#: src/net/eathena/generalrecv.cpp:189
 msgid "Map not found"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
-msgstr "Disconnected from server!"
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "Strength"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "Agility"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr "Vitality"
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "Intelligence"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr "Dexterity"
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr "Luck"
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
-msgstr ""
-
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
-msgstr ""
-
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
-msgstr ""
-
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
-msgstr ""
-
 #. TRANSLATORS: notification message
-#: src/net/eathena/inventoryhandler.cpp:913
+#: src/net/eathena/inventoryrecv.cpp:546
 #, c-format
 msgid "Left %s rental time for item %s."
 msgstr ""
@@ -8681,27 +8691,27 @@ msgstr ""
 #. TRANSLATORS: unknown item
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
-#: src/net/eathena/inventoryhandler.cpp:1176
-#: src/net/eathena/inventoryhandler.cpp:1309 src/resources/db/itemdb.cpp:240
+#: src/net/eathena/inventoryrecv.cpp:801 src/net/eathena/inventoryrecv.cpp:934
+#: src/resources/db/itemdb.cpp:240
 msgid "Unknown item"
 msgstr "Unknown item"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginhandler.cpp:343 src/net/tmwa/loginhandler.cpp:243
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginhandler.cpp:347 src/net/tmwa/loginhandler.cpp:247
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginhandler.cpp:351 src/net/tmwa/loginhandler.cpp:251
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailhandler.cpp:216
+#: src/net/eathena/mailrecv.cpp:149
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8779,32 +8789,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:308
+#: src/net/tmwa/charserverhandler.cpp:223
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:310
+#: src/net/tmwa/charserverhandler.cpp:225
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:312
+#: src/net/tmwa/charserverhandler.cpp:227
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:314
+#: src/net/tmwa/charserverhandler.cpp:229
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:316
+#: src/net/tmwa/charserverhandler.cpp:231
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:318
+#: src/net/tmwa/charserverhandler.cpp:233
 msgid "Luck:"
 msgstr ""