Update translations.

author: Andrei Karas <akaras@inbox.ru> 2015-08-29 17:14:06 +0300
committer: Andrei Karas <akaras@inbox.ru> 2015-08-29 17:14:06 +0300
commit: dfea7028b3b2e3c3dad896881a705ed213730426 (patch)
tree: 013216f369b54194ad415049aa22a5169336e8c4
parent: 973606a6dbd201050b7d4cd0a6a782ff742056f6 (diff)
download: plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.gz
plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.bz2
plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.xz
plus-dfea7028b3b2e3c3dad896881a705ed213730426.zip
40 files changed, 7125 insertions, 6977 deletions
diff --git a/po/ar.po b/po/ar.po
index 2b28e7725..acc0fad6c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,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: Arabic (http://www.transifex.com/akaras/manaplus/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -546,12 +545,10 @@ msgstr ""
 #: 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 "خطأ"
 
@@ -1384,89 +1381,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"
@@ -1740,8 +1752,8 @@ msgstr ""
 #. 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 ""
 
@@ -3791,7 +3803,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
@@ -5743,10 +5755,9 @@ msgstr ""
 #. 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 ""
 
@@ -5833,7 +5844,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 ""
@@ -8153,175 +8164,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"
@@ -8329,28 +8340,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 ""
 
@@ -8371,320 +8382,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8692,27 +8702,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 ""
 
 #. 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 ""
@@ -8790,32 +8800,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/bg.po b/po/bg.po
index 5f4e257fe..f520bef9a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,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: Bulgarian (http://www.transifex.com/akaras/manaplus/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 ""
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr ""
 #. 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 ""
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr ""
 #. 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 ""
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8680,27 +8690,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 ""
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/ca.po b/po/ca.po
index 3e843720e..1571010d9 100644
--- a/po/ca.po
+++ b/po/ca.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-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -53,10 +53,10 @@ msgstr "Arxiu enviat"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -489,8 +489,8 @@ msgstr "Ajuda"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -544,10 +544,10 @@ msgstr "Canviant servidors de joc"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Error"
 
@@ -1927,7 +1927,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2021,7 +2021,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Conjunt"
@@ -2173,9 +2173,9 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Botiga"
 
@@ -2198,8 +2198,8 @@ msgstr "Emmagatzema-ho tot"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -2226,8 +2226,8 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2423,8 +2423,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Deixar caure..."
 
@@ -2439,7 +2439,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Deixar caure"
 
@@ -2817,7 +2817,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4309,7 +4309,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Botiga"
 
@@ -5382,7 +5382,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipament"
 
@@ -5393,7 +5393,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventari"
@@ -5405,7 +5405,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Motxilla"
@@ -5787,9 +5787,9 @@ msgstr "Juga"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informació"
 
@@ -5876,7 +5876,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5990,13 +5990,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6004,7 +6004,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6012,7 +6012,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6024,32 +6024,32 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8185,58 +8185,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8258,102 +8258,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8361,28 +8361,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Error desconegut."
 
@@ -8403,64 +8403,64 @@ msgstr "Connexió interrompuda amb el servidor. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8592,125 +8592,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticació fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "No hi ha cap servidor disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Algú altre està provant d'utilitzar aquest compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Aquest compte ja està sent utilitzat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de desplaçament ràpid detectat."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Accès de sessió duplicat."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Error de connexió desconegut."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8729,21 +8729,21 @@ msgid "Unknown item"
 msgstr "Objecte desconegut"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Antiga contrasenya incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8821,32 +8821,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s bol un intercanvi amb tu, acceptes?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index b94f4d80b..f958897d1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
@@ -58,10 +58,10 @@ msgstr "Soubor byl uploadován"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -494,8 +494,8 @@ msgstr "Nápověda"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -549,10 +549,10 @@ msgstr "Vyměňuji herní servery"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Chyba"
 
@@ -1396,9 +1396,8 @@ msgstr "Činsky (Čína)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Činsky (Čína)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1935,7 +1934,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2029,7 +2028,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Výstroje"
@@ -2181,9 +2180,9 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Uložit"
 
@@ -2206,8 +2205,8 @@ msgstr "Uschovat všechny"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Vzít"
 
@@ -2234,8 +2233,8 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2431,8 +2430,8 @@ msgstr "Chránit předmět"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Upustit..."
 
@@ -2447,7 +2446,7 @@ msgstr "Upustit vše"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Upustit"
 
@@ -2825,7 +2824,7 @@ msgstr "Úroveň: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4317,7 +4316,7 @@ msgstr "Povolit upozornění na váhu"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Obchod"
 
@@ -5395,7 +5394,7 @@ msgstr "VYB"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Vybavení"
 
@@ -5406,7 +5405,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventář"
@@ -5418,7 +5417,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Košík"
@@ -5800,9 +5799,9 @@ msgstr "Hrát"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informace"
 
@@ -5894,7 +5893,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "mazlíček patřící %s"
@@ -6008,13 +6007,13 @@ msgid "Did you know..."
 msgstr "Věděl jsi že..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6022,7 +6021,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Insert"
@@ -6030,7 +6029,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6042,32 +6041,32 @@ msgid "Equip"
 msgstr "Vybavit"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8205,60 +8204,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Přístup zamítnut. Nejpravděpodobněji je na serveru příliš mnoho hráčů."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Nemohu použít toto ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Neznámá chyba postavy na serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
 "existuje."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Špatné jméno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Nesprávné statistiky."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Nesprávný účes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Nesprávný místo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Špatná rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Špatný vzhled."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Postava odstraněna."
 
@@ -8280,102 +8279,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr "Šeptání nebylo možné zaslat, jsi ignorován všemi hráči."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Hra"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Požadavek na odchod odepřen!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Jméno gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Vedoucí gildy: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Úroveň gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Připojených členů: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Maximálně členů: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Průměrná úroveň: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Zkušenosti gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Další zkušenosti gildy: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Hrad gildy: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Neregistované ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Platnost účtu vypršela."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Odmítnutí od serveru."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Byl jste trvale vyloučen ze hry. Prosím kontaktujte GM team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Klientský software je příliš starý."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8385,28 +8384,28 @@ msgstr ""
 "Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Server je přelidněný."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Toto uživatelské jméno je již používáno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Špatný e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Neznámá chyba."
 
@@ -8427,64 +8426,64 @@ msgstr "Spojení se serverem ukončeno. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Chyba přejmenování postavy."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Postava přejmenována."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Přejmenování není povoleno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Nové jméno nebylo nastaveno."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Postava nenalezena."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Nepodařilo se odstranit postavu."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Na tomto místě není možné použít dovednost."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Na tomto místě není požné použít předmět."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Není možné obléct. Špatná úroveň."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Nené možné použít. Špatná úroveň."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Na tomhle se pracuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Zpráva nemohla být poslána. Kanál %s neexistuje."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Není možné otevřít kanál %s. Kanál neexistuje."
@@ -8616,125 +8615,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Ověření selhalo."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Nejsou dostupné žádné servery."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Někdo jiný se pokouší používat tento účet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Tento účet je již přihlášen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Detekován podvod s rychlostí."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Server je plný."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Promiň jsi moc mladý."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicitní přihlášení."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Moc spojení z jedné IP adresy."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Není neplaceno."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Placení pozastaveno."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Placení zeměněno."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "Zaplatit špatnou IP adresu."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Zaplatit herní místnost."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "Odpojení vynuceno GM."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Neznámá chyba připojení."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8753,21 +8752,21 @@ msgid "Unknown item"
 msgstr "Neznámý předmět"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Účet nenalezen, prosím přihlaste se znovu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Půvoní heslo je nesprávné."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nové heslo je příliš krátké."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8845,32 +8844,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s s tebou chce obchodovat, souhlasíš?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Síla:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Hbitost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitalita:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Inteligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Obratnost:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Štěstí:"
 
diff --git a/po/de.po b/po/de.po
index 8c68e1d12..001d17df5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
@@ -77,10 +77,10 @@ msgstr "Datei hochgeladen"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -514,8 +514,8 @@ msgstr "Hilfe"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -569,10 +569,10 @@ msgstr "Spielserver wechseln"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Fehler"
 
@@ -1423,9 +1423,8 @@ msgstr "Chinesisch (China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinesisch (China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1962,7 +1961,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2056,7 +2055,7 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Ausrüstungset"
@@ -2208,9 +2207,9 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -2233,8 +2232,8 @@ msgstr "Alles aufbewahren"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Abholen"
 
@@ -2261,8 +2260,8 @@ msgstr "Alles abholen"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2458,8 +2457,8 @@ msgstr "Gegenstand schützen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
@@ -2474,7 +2473,7 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Wegwerfen"
 
@@ -2852,7 +2851,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -3973,17 +3972,12 @@ msgid "Highlight words (separated by comma)"
 msgstr "Wörter hervorheben (Mit Komma trennen)"
 
 #: src/gui/widgets/tabs/setup_chat.cpp:267
-#, fuzzy
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
-"Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . "
-"Benutze durch Komma getrennte Wörter.\n"
-"\n"
-"Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:273
@@ -4479,7 +4473,7 @@ msgstr "Benachrichtigungen über Gewicht aktivieren"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Laden"
 
@@ -5564,7 +5558,7 @@ msgstr "AUS"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Ausrüstung"
 
@@ -5575,7 +5569,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventar"
@@ -5587,7 +5581,7 @@ msgstr "EK"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Einkaufswagen"
@@ -5969,9 +5963,9 @@ msgstr "Spielen"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -6063,7 +6057,7 @@ msgid "Broken nick detected: "
 msgstr "Defekter Spielername entdeckt: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "%ss Haustier"
@@ -6177,13 +6171,13 @@ msgid "Did you know..."
 msgstr "Wusstest Du schon..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr "Karte einfügen"
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6191,7 +6185,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Einfügen"
@@ -6199,7 +6193,7 @@ msgstr "Einfügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6211,32 +6205,32 @@ msgid "Equip"
 msgstr "Ausrüsten"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8372,61 +8366,61 @@ msgid "Npc"
 msgstr "NPC"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Kann diese ID nicht verwenden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Unbekannter Charakterserver Fehler."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon "
 "benutzt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Falscher Name."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Falsche Stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Falsche Haare."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Falscher Slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Falsche Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Falsches Aussehen."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Charakter gelöscht."
 
@@ -8450,102 +8444,102 @@ msgstr ""
 "ignoriert."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Spiel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Anfrage zum Verlassen verweigert!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Gildenname: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Gilden Meister: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Gilden Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Mitglieder Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Mitglieder: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Durchschn. Level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Verbl. Gilden-EP: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Gildenburg: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Nicht registrierte ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Falsches Passwort."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Account abgelaufen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Vom Server abgelehnt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Du wurdest für immer vom Spiel gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Client ist zu alt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8555,28 +8549,28 @@ msgstr ""
 "Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Server überfüllt."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Dieser Benutzername ist bereits vorhanden."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Falsche E-Mail-Adresse."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Benutzername für immer gelöscht."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
@@ -8597,64 +8591,64 @@ msgstr "Verbindung mit Server abgebrochen. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Fehler beim Umbennen des Charakters."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Charakter umbenannt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Umbennen ist nicht erlaubt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Neuer Name ist nicht gesetzt."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Charakter nicht gefunden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Konnte Charakter nicht löschen."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Kann keine Fähigkeiten in diesem Bereich wirken."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Kann Gegenstände in diesem Bereich nicht benutzen."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Kann das nicht ausrüsten. Falsches Level."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Kann das nicht benutzen. Falsches Level."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Ist in Arbeit."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Nachricht konnte nicht gesendet werden, Kanal %s gibt es nicht."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Kann Kanal nicht öffnen. Kanal %s gibt es nicht."
@@ -8786,125 +8780,125 @@ msgid "Manner"
 msgstr "Verhalten"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Keine Server verfügbar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Jemand anderes versucht diesen Account zu benutzen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Geschwindigkeits-Hack festgestellt."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Server ist voll."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Tut uns leid, aber du bist minderjährig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Mehrfache Anmeldung."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Zu viele Verbindungen von der selben IP."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Für diese Zeit nicht bezahlt."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Zahlung eingestellt."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Zahlung geändert."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "Falsche Zahlungs IP."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Spielraum bezahlen."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "Erzwungene Trennung von einem GM."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Japanische IP sind nicht erlaubt."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr "Verbliebender anderer Account."
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr "Unsaubere IP."
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr "Jede IP zählen."
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr "IP zählen."
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Speicher."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr "?Han? : Bann gültig."
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr "Begrenzter IP Zugang."
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Über Charakterliste."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "IP blockiert."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Ungültige Passwortanzahl."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Keine erlaubte Rasse."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Unbekannter Verbindungsfehler."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Karte nicht gefunden"
 
@@ -8923,21 +8917,21 @@ msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Altes Passwort falsch."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Das neue Passwort ist zu kurz."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Du hast eine neue Nachricht von %s mit dem Betreff %s"
@@ -9015,32 +9009,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s möchte mit dir handeln, stimmst du zu?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Stärke:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Beweglichkeit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Gesundheit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligenz:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Geschick:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Glück:"
 
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 ""
 
diff --git a/po/eo.po b/po/eo.po
index f0cf92c54..c25ec22ea 100644
--- a/po/eo.po
+++ b/po/eo.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: Esperanto (http://www.transifex.com/akaras/manaplus/language/eo/)\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 ""
 
@@ -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 ""
 #: 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 "Eraro"
 
@@ -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 ""
 #. 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 ""
 
@@ -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 "Ludi"
 #. 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 ""
 
@@ -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 "Nekorekta nomo."
 
 #. 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 "Nekorekta haro."
 
 #. 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 "Nekonata eraro."
 
@@ -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 ""
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "Forto"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "Rapideco"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "Lerteco"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr ""
+
+#. 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 ""
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "Forto"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "Rapideco"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr ""
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "Lerteco"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr ""
-
-#. 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 ""
 
 #. 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 ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:308
+#: src/net/tmwa/charserverhandler.cpp:223
 msgid "Strength:"
 msgstr "Forto:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:310
+#: src/net/tmwa/charserverhandler.cpp:225
 msgid "Agility:"
 msgstr "Rapideco:"
 
 #. 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 "Lerteco:"
 
 #. 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 ""
 
diff --git a/po/es.po b/po/es.po
index cb11c9b19..cf55f3322 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 22:40+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -65,10 +65,10 @@ msgstr "Archivo subido"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -501,8 +501,8 @@ msgstr "Ayuda"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -556,10 +556,10 @@ msgstr "Cambiando servidores del juego"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Error"
 
@@ -1407,9 +1407,8 @@ msgstr "Chino (China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chino (China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1946,7 +1945,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2040,7 +2039,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Vestimenta"
@@ -2192,9 +2191,9 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Almacenar"
 
@@ -2217,8 +2216,8 @@ msgstr "Almacenar todo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Recuperar"
 
@@ -2245,8 +2244,8 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2442,8 +2441,8 @@ msgstr "Proteger artículo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Tirar..."
 
@@ -2458,7 +2457,7 @@ msgstr "Tirar todo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Tirar"
 
@@ -2836,7 +2835,7 @@ msgstr "Nivel: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4347,7 +4346,7 @@ msgstr "Habilitar notificaciones de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Tienda"
 
@@ -5427,7 +5426,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipamiento"
 
@@ -5438,7 +5437,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventario"
@@ -5450,7 +5449,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Mochila"
@@ -5836,9 +5835,9 @@ msgstr "Jugar"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Información"
 
@@ -5930,7 +5929,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -6045,13 +6044,13 @@ msgid "Did you know..."
 msgstr "¿Sabías que..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6059,7 +6058,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Insert"
@@ -6067,7 +6066,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6079,32 +6078,32 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8242,60 +8241,60 @@ msgid "Npc"
 msgstr "Npc"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
 "servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Imposible usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Falla char-server desconocida."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Nombre equivocado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Estadísticas incorrectas."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Cabello incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Ranura incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Raza incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Apariencia incorrecta."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personaje borrado."
 
@@ -8319,91 +8318,91 @@ msgstr ""
 "jugadores."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Juego"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "¡Petición de salida denegada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nombre del gremio: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maestro del gremio: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nivel del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Miembros conectados: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Máx. Miembros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Nivel promedio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Experiencia del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Experiencia siguiente del gremio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castillo del gremio: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "ID no registrada."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Contraseña incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "La cuenta expiró."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Rechazado del servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -8411,12 +8410,12 @@ msgstr ""
 "equipo de GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Cliente es demasiado antiguo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8426,28 +8425,28 @@ msgstr ""
 "Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Servidor sobrepoblado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "E-mail incorrecto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -8468,64 +8467,64 @@ msgstr "Conexión al servidor terminada. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Error de renombrado del personaje."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Personaje renombrado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "No se permite renombrar."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "El nuevo nombre no está establecido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Personaje no encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Fallo al borrar el personaje."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "No puedes lanzar la habilidad en esta área."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "No puedes usar el artículo en esta área."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "No puedes equipar. Nivel equivocado."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "No puedes usar. Nivel equivocado."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Trabajo en progreso."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "El mensaje no se pudo enviar, el canal %s no existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "No se puede abrir el cana. El canal %s no existe."
@@ -8657,125 +8656,125 @@ msgid "Manner"
 msgstr "Comportamiento"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticación fallida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "No hay servidores disponibles."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Alguien más está tratando de usar esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Ya hay alguien conectado con esta cuenta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack detectado."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Servidor lleno."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Lo siento, tú eres menor de edad."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Inicio de sesión duplicada."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Muchas conecciones desde la misma IP."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "No pagas esta vez."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Pago suspendido."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Pago cambiado."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "Desconección forzada por GM."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Rechazo de censura japonesa."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Memoria."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Over characters list."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "IP bloqueada."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Conteo inválido de contraseña."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Raza no permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Error de conexión desconocido."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Mapa no encontrado"
 
@@ -8794,21 +8793,21 @@ msgid "Unknown item"
 msgstr "Elemento desconocido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Cuenta no encontrada. Por favor, vuelve a iniciar sesión."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Contraseña anterior incorrecta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nueva contraseña es muy corta."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Tienes un nuevo correo de %s, con el asunto %s"
@@ -8886,32 +8885,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quiere realizar un intercambio contigo, ¿aceptas?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Fuerza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agilidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitalidad:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Inteligencia:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Suerte:"
 
diff --git a/po/et.po b/po/et.po
index 7c0720e02..862406b8b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,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: Estonian (http://www.transifex.com/akaras/manaplus/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 "Viga"
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr ""
 #. 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 ""
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr ""
 #. 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 ""
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8680,27 +8690,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 ""
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/fa.po b/po/fa.po
index c7baec626..ed98257e9 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,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: Persian (http://www.transifex.com/akaras/manaplus/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "تایید"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -541,12 +540,10 @@ msgstr ""
 #: 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 "خطا"
 
@@ -1379,89 +1376,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"
@@ -1735,8 +1747,8 @@ msgstr ""
 #. 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 ""
 
@@ -3786,7 +3798,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
@@ -5738,10 +5750,9 @@ msgstr ""
 #. 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 ""
 
@@ -5828,7 +5839,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 ""
@@ -8138,175 +8149,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"
@@ -8314,28 +8325,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 ""
 
@@ -8356,320 +8367,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8677,27 +8687,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 ""
 
 #. 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 ""
@@ -8775,32 +8785,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/fi.po b/po/fi.po
index af2b75477..b4586d1c9 100644
--- a/po/fi.po
+++ b/po/fi.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-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -53,10 +53,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "Ok"
 
@@ -488,8 +488,8 @@ msgstr "Apua"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -543,10 +543,10 @@ msgstr "Vaihdan pelipalvelinta"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Virhe"
 
@@ -1389,9 +1389,8 @@ msgstr "Kiina (kiina)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Kiina (kiina)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1928,7 +1927,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2022,7 +2021,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Asukokonaisuudet"
@@ -2174,9 +2173,9 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Varastoi"
 
@@ -2199,8 +2198,8 @@ msgstr "Varastoi kaikki"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Ota"
 
@@ -2227,8 +2226,8 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2424,8 +2423,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Pudota..."
 
@@ -2440,7 +2439,7 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Pudota"
 
@@ -2818,7 +2817,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4310,7 +4309,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -5379,7 +5378,7 @@ msgstr "Var"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Varusteet"
 
@@ -5390,7 +5389,7 @@ msgstr "Tav"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Tavarat"
@@ -5402,7 +5401,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Kärry"
@@ -5784,9 +5783,9 @@ msgstr "Pelaa"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Tietoja"
 
@@ -5873,7 +5872,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5987,13 +5986,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6001,7 +6000,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6009,7 +6008,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6021,32 +6020,32 @@ msgid "Equip"
 msgstr "Ota käyttöön"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8180,58 +8179,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Tätä tunnistetta ei voi käyttää."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Tuntematon hahmopalvelinvirhe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Väärä nimi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Väärät arvot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Väärä hiustyyli."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Väärä paikka."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Väärä rotu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Hahmo poistettu."
 
@@ -8253,103 +8252,103 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Peli"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Lopetuspyyntö evätty!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Killan nimi: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Kiltamestari: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Kiltataso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Jäseniä linjoilla: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Jäsenmaksimi: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Keskim. taso: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Kiltakokemusta: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Seuraavaan tasoon: %d kkp"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Killan linna: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Rekisteröimätön tunniste."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Väärä salasana."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Tili vanhentunut."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Liian vanha asiakasohjelma."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8359,28 +8358,28 @@ msgstr ""
 "Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Palvelin on täynnä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Käyttäjätunnus on jo käytössä."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
@@ -8401,64 +8400,64 @@ msgstr "Yhteys palvelimeen katkaistu. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Hahmon poisto epäonnistui."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8590,125 +8589,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Tunnistus epäonnistui."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Palvelimia ei saatavilla."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Nopeusviritelmä havaittu."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Kaksinkertainen sisäänkirjautuminen."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Tuntematon yhteysongelma."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8727,21 +8726,21 @@ msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Vanha salsana on väärä."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8819,32 +8818,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Voima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Ketteryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Tuuri:"
 
diff --git a/po/fr.po b/po/fr.po
index d16e4e084..dcfc4a761 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
@@ -65,10 +65,10 @@ msgstr "Fichier mis en ligne"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "Ok"
 
@@ -503,8 +503,8 @@ msgstr "Aide"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -558,10 +558,10 @@ msgstr "Changement de serveur de jeu"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Erreur"
 
@@ -1416,9 +1416,8 @@ msgstr "Chinois (Chine)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinois (Chine)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1955,7 +1954,7 @@ msgstr "Déposer le butin"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2049,7 +2048,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Costumes"
@@ -2201,9 +2200,9 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Entreposer"
 
@@ -2226,8 +2225,8 @@ msgstr "Entreposer tout"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Récupérer"
 
@@ -2254,8 +2253,8 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2451,8 +2450,8 @@ msgstr "Objet protégé"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Déposer..."
 
@@ -2467,7 +2466,7 @@ msgstr "Déposer tout"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Déposer"
 
@@ -2845,7 +2844,7 @@ msgstr "Niveau : %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4339,7 +4338,7 @@ msgstr "Activer les notifications de poids"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Boutique"
 
@@ -5426,7 +5425,7 @@ msgstr "Equ"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -5437,7 +5436,7 @@ msgstr "Inv"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventaire"
@@ -5449,7 +5448,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Panier"
@@ -5831,9 +5830,9 @@ msgstr "Jouer"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informations"
 
@@ -5925,7 +5924,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -6039,13 +6038,13 @@ msgid "Did you know..."
 msgstr "Savais-tu que..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6053,7 +6052,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Insérer"
@@ -6061,7 +6060,7 @@ msgstr "Insérer"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6073,32 +6072,32 @@ msgid "Equip"
 msgstr "Équiper"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8238,60 +8237,60 @@ msgid "Npc"
 msgstr "Npc"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Tu ne peux pas utiliser cette identification."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Erreur inconnue du serveur de personnage."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
 "utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Mauvais nom."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Stats incorrectes."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Cheveux incorrects."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Case incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Race incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Apparence incorrecte."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personnage supprimé."
 
@@ -8315,91 +8314,91 @@ msgstr ""
 "joueurs."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Jeu"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Requête de départ refusée !"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nom de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Maître de la guilde : %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Niveau de la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Membres en ligne : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Membres maximums : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Niveau moyen : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Expérience Groupe : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Expérience suivante pour la guilde : %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Château de la guilde : %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Id non enregistrée."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Mauvais mot de passe."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Le compte a expiré."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Rejeté par le serveur."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -8407,12 +8406,12 @@ msgstr ""
 "MJs."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Client trop ancien."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8422,28 +8421,28 @@ msgstr ""
 "Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Serveur surpeuplé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Mail incorrecte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
@@ -8464,64 +8463,64 @@ msgstr "Connexion au serveur terminée. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Erreur du renommage du personnage."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Personnage renommé."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Renommage non permis."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Le nouveau nom n'est pas appliqué."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Personnage non trouvé."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "La suppression du personnage n'a pu s'effectuer."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Ne peux pas lancer de compétence dans cette zone."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Ne peux pas utiliser cet objet dans cette zone."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Ne peux pas être équipé. Niveau insuffisant."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Ne peux pas être utilisé. Niveau insuffisant."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Travail en cours."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Le message n'a pas pu être envoyé, la chaîne %s n'existe pas."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Ne peut pas ouvrir la chaîne. La chaîne %s n'existe pas."
@@ -8653,125 +8652,125 @@ msgid "Manner"
 msgstr "Manière"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Aucun serveur n'est disponible."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Ce compte est déjà connecté."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack détecté."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Serveur plein."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Désolé, vous êtes trop jeune."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Authentification déjà effectuée."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Trop de connexions avec la même adresse ip."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Non payé pour le moment."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Paiement suspendu."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Paiement changé."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "Paie le mauvais ip."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Payez le serveur."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "Déconnexion forcé par le MJ."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Bannir le Japon refusé."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr "L'autre compte subsiste."
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr "Adresse Ip invalide."
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr "Nombre d'adresses Ip totale."
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr "Nombre d'adresses Ip."
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Mémoire."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr "Pseudonyme disponible."
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr "Adresse Ip avec accès limité."
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Au dessus de la liste des personnages."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "Adresse Ip bloquée."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Taille du mot de passe invalide."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Race non permise."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Carte non trouvée"
 
@@ -8790,21 +8789,21 @@ msgid "Unknown item"
 msgstr "Objet inconnu"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Le compte n'a pas été trouvé. Reconnectes-toi s'il-te-plaît."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Ancien mot de passe incorrect."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Le nouveau mot de passe est trop court."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8882,32 +8881,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Force :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agilité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitalité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligence :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Dextérité :"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Chance :"
 
diff --git a/po/he.po b/po/he.po
index 9336620db..91ea79ee6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,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: Hebrew (http://www.transifex.com/akaras/manaplus/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "אישור"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 "שגיאה"
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr "סחרר"
 #. 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 "תקוף"
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr "שחק"
 #. 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 "מידע"
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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 "נותקת מהשרת!"
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "עוצמה"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "זריזות"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr "חיוניות"
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "תבונה"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr "מיומנות"
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr "מזל"
+
+#. 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 "נותקת מהשרת!"
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "עוצמה"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "זריזות"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr "חיוניות"
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "תבונה"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr "מיומנות"
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr "מזל"
-
-#. 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 ""
@@ -8680,27 +8690,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 "חפץ לא ידוע"
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
 
 #. 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 ""
 
diff --git a/po/hr.po b/po/hr.po
index 26d92397f..33244cf2c 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,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: Croatian (http://www.transifex.com/akaras/manaplus/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "U redu"
 
@@ -257,7 +256,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 ""
 #: 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 "Greška"
 
@@ -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 "Trgovanje"
 #. 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 "Napad"
 
@@ -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 "Igraj"
 #. 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 ""
@@ -8144,175 +8155,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"
@@ -8320,28 +8331,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 ""
 
@@ -8362,320 +8373,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 ""
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "Snaga"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "Okretnost"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr "Vitalnost"
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "Inteligencija"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr "Spretnost"
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr "Sreća"
+
+#. 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 ""
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "Snaga"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "Okretnost"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr "Vitalnost"
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "Inteligencija"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr "Spretnost"
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr "Sreća"
-
-#. 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 ""
@@ -8683,27 +8693,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 "Nepoznati predmet"
 
 #. 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 ""
@@ -8781,32 +8791,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
 
 #. 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 ""
 
diff --git a/po/hu.po b/po/hu.po
index 15f0604fa..cead87396 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,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: Hungarian (http://www.transifex.com/akaras/manaplus/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 "Hiba"
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr "Üzlet"
 #. 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 "Támadás"
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr "Játék"
 #. 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 "Infó"
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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 "Lekapcsolódtál a szerverről!"
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "Erő"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "Mozgékonyság"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr "Egészség"
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "Intelligencia"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr "Ügyesség"
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr "Szerencse"
+
+#. 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 "Lekapcsolódtál a szerverről!"
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "Erő"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "Mozgékonyság"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr "Egészség"
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "Intelligencia"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr "Ügyesség"
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr "Szerencse"
-
-#. 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 ""
@@ -8680,27 +8690,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 "Ismeretlen tárgy"
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
 
 #. 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 ""
 
diff --git a/po/id.po b/po/id.po
index d1bb17d28..1b1f3c266 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -57,10 +57,10 @@ msgstr "Data telah terunggah"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -492,8 +492,8 @@ msgstr "Bantuan"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -547,10 +547,10 @@ msgstr "Mengganti server"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Kesalahan"
 
@@ -1393,9 +1393,8 @@ msgstr "Cina"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Cina"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1932,7 +1931,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2026,7 +2025,7 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Perlengkapan"
@@ -2178,9 +2177,9 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Simpan"
 
@@ -2203,8 +2202,8 @@ msgstr "Simpan semua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Ambil"
 
@@ -2231,8 +2230,8 @@ msgstr "Ambil semua"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2428,8 +2427,8 @@ msgstr "Proteksi item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Buang..."
 
@@ -2444,7 +2443,7 @@ msgstr "Buang semua"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Buang"
 
@@ -2822,7 +2821,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4312,7 +4311,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Toko"
 
@@ -5380,7 +5379,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Perlengkapan"
 
@@ -5391,7 +5390,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Perbekalan"
@@ -5403,7 +5402,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5785,9 +5784,9 @@ msgstr "Main"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr ""
 
@@ -5874,7 +5873,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5988,13 +5987,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6002,7 +6001,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6010,7 +6009,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6022,32 +6021,32 @@ msgid "Equip"
 msgstr "Pakai"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8179,58 +8178,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8252,102 +8251,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Versi yang digunakan sudah kadaluarsa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8355,28 +8354,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Server kepenuhan."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr ""
 
@@ -8397,64 +8396,64 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8586,125 +8585,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8723,21 +8722,21 @@ msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8815,32 +8814,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Kekuatan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Kecerdasan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Ketangkasan:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 02931eea9..153b26b14 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -62,10 +62,10 @@ msgstr "File caricato"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -498,8 +498,8 @@ msgstr "Aiuto"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -553,10 +553,10 @@ msgstr "Cambiamento server del gioco"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Errore"
 
@@ -1404,9 +1404,8 @@ msgstr "Cinese (Cina)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Cinese (Cina)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1943,7 +1942,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2037,7 +2036,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Attrezzatura"
@@ -2189,9 +2188,9 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2214,8 +2213,8 @@ msgstr "Salva tutto"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Recupera"
 
@@ -2242,8 +2241,8 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2439,8 +2438,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Lascia..."
 
@@ -2455,7 +2454,7 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Lascia"
 
@@ -2833,7 +2832,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4325,7 +4324,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Negozio"
 
@@ -5399,7 +5398,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipaggiamento"
 
@@ -5410,7 +5409,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventario"
@@ -5422,7 +5421,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Carrello"
@@ -5804,9 +5803,9 @@ msgstr "Gioca"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informazioni"
 
@@ -5893,7 +5892,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6007,13 +6006,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6021,7 +6020,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Insert"
@@ -6029,7 +6028,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6041,32 +6040,32 @@ msgid "Equip"
 msgstr "Equipaggia"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8202,58 +8201,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Accesso negato. Probabilmente il server è sovraccarico."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "ID non disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Errore char-server sconosciuto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Creazione personaggio non riuscita. Il nome è già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Nome errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Statistiche errate."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Taglio capelli errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Slot errato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Razza errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personaggio eliminato."
 
@@ -8275,91 +8274,91 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Gioco"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Richiesta di chiusura rifiutata!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Master di Gilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Livello Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Membri Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Numero massimo Membri: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Livello Medio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punti Exp Gilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "ID non registrato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Password errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Account scaduto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Rifiutato dal server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -8367,12 +8366,12 @@ msgstr ""
 "per maggiori informazioni."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Versione del Client obsoleta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8382,28 +8381,28 @@ msgstr ""
 "Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Server affollato."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Username già in uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Email errata."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Username cancellato permanentemente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
@@ -8424,64 +8423,64 @@ msgstr "Connessione al server terminata. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Eliminazione personaggio fallita."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8613,125 +8612,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Nessun server disponibile."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Qualcun altro sta provando ad usare questo account."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Questo account è già registrato."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Rilevato speed hack."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Accesso duplicato."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Errore di connessione sconosciuto."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8750,21 +8749,21 @@ msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "L'account non è stato trovato. Per favore effettua un nuovo login."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "La vecchia password è sbagliata."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "La nuova password è troppo corta."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8842,32 +8841,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vuole commerciare con te, accetti?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Forza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agilità:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Costituzione:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligenza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Destrezza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Fortuna:"
 
diff --git a/po/ja.po b/po/ja.po
index c7c025dad..03f8857be 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -58,10 +58,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -492,8 +492,8 @@ msgstr "ヘルプ"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -547,10 +547,10 @@ msgstr "ゲームサーバーを変更しています"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "エラー"
 
@@ -1395,9 +1395,8 @@ msgstr "中国語 (中国)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "中国語 (中国)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1934,7 +1933,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2028,7 +2027,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "服装"
@@ -2180,9 +2179,9 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "保管"
 
@@ -2205,8 +2204,8 @@ msgstr "全部保存"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取出す"
 
@@ -2233,8 +2232,8 @@ msgstr "全部取出す"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2430,8 +2429,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "落とす..."
 
@@ -2446,7 +2445,7 @@ msgstr "全て落とす"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "落とす"
 
@@ -2824,7 +2823,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4316,7 +4315,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "店"
 
@@ -5384,7 +5383,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "装着品"
 
@@ -5395,7 +5394,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "インベントリー"
@@ -5407,7 +5406,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "カート"
@@ -5789,9 +5788,9 @@ msgstr "プレイ"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "情報"
 
@@ -5878,7 +5877,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5992,13 +5991,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6006,7 +6005,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "挿入"
@@ -6014,7 +6013,7 @@ msgstr "挿入"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6026,32 +6025,32 @@ msgid "Equip"
 msgstr "装着"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8185,60 +8184,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "アクセスできません。サーバーが混みあっています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "このIDは使用できません."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "不明なキャラクターサーバーエラー."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
 "れています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "名前が違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "間違った統計."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "間違った髪型."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "間違ったスロット."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "種別が間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "キャラクターを削除しました."
 
@@ -8260,102 +8259,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "ゲーム"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "今キャンセルできません!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "ギルド名: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "ギルドマスター: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "ギルドレベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "オンラインユーザー: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "最大メンバー数: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "平均レベル: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "ギルドExp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "次のギルドExpまで: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "ギルド城: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "未登録なID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "入力したパスワードは間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "アカウントの有効期限が切れました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "サーバーから拒否されました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "ゲームから永久追放されました。詳細はGMチームへ連絡して下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "アップデートが必要です."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8365,28 +8364,28 @@ msgstr ""
 "GMにご連絡下さい."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "サーバーが混雑しています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "ユーザ名は既に使用されています."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "メールアドレスが違います."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "ユーザーネームは永久に削除されました."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "不明なエラー."
 
@@ -8407,64 +8406,64 @@ msgstr "サーバーへの接続が切断されました. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "キャラクター削除に失敗しました."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8596,125 +8595,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "認証に失敗しました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "利用できるサーバーがありません."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "他からのログインがありました."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "このアカウントは既にログイン中です."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "スピードハックが探知されました."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "重複ログイン."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "不明な接続エラーです."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8733,21 +8732,21 @@ msgid "Unknown item"
 msgstr "不明なアイテム"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "アカウントが見つかりませんでした。再度ログインして下さい."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "変更前のパスワードが間違っています."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "新しいパスワードは文字数が足りません."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8825,32 +8824,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%sはあなたにトレードを申請しています?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "攻撃力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "機敏さ:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "防御力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "魔力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "命中率:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "幸運:"
 
diff --git a/po/ka.po b/po/ka.po
index 3745946a1..139fad708 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,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: Georgian (http://www.transifex.com/akaras/manaplus/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -541,12 +540,10 @@ msgstr ""
 #: 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 ""
 
@@ -1379,89 +1376,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"
@@ -1735,8 +1747,8 @@ msgstr ""
 #. 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 ""
 
@@ -3786,7 +3798,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
@@ -5738,10 +5750,9 @@ msgstr ""
 #. 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 ""
 
@@ -5828,7 +5839,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 ""
@@ -8138,175 +8149,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"
@@ -8314,28 +8325,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 ""
 
@@ -8356,320 +8367,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8677,27 +8687,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 ""
 
 #. 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 ""
@@ -8775,32 +8785,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 8589c6a83..08f8ec14b 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,10 +51,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr ""
 
@@ -486,8 +486,8 @@ msgstr ""
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -541,10 +541,10 @@ msgstr ""
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr ""
 
@@ -1924,7 +1924,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2018,7 +2018,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr ""
@@ -2170,9 +2170,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
@@ -2195,8 +2195,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
@@ -2223,8 +2223,8 @@ msgstr ""
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2420,8 +2420,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
@@ -2436,7 +2436,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
@@ -2814,7 +2814,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4304,7 +4304,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr ""
 
@@ -5372,7 +5372,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr ""
 
@@ -5383,7 +5383,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr ""
@@ -5395,7 +5395,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5777,9 +5777,9 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr ""
 
@@ -5866,7 +5866,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5980,13 +5980,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -5994,7 +5994,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6002,7 +6002,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6014,32 +6014,32 @@ msgid "Equip"
 msgstr ""
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8173,58 +8173,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8246,102 +8246,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8349,28 +8349,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr ""
 
@@ -8391,64 +8391,64 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8580,125 +8580,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8717,21 +8717,21 @@ msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8809,32 +8809,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 238b14b09..50fc479bc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,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: Norwegian Bokmål (http://www.transifex.com/akaras/manaplus/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 "Feil"
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr ""
 #. 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 ""
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr ""
 #. 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 ""
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8680,27 +8690,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 ""
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/nl.po b/po/nl.po
index 88dae590e..fd31fec7f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -55,10 +55,10 @@ msgstr "Bestand is opgeladen"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "Oké"
 
@@ -490,8 +490,8 @@ msgstr "Help"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -545,10 +545,10 @@ msgstr "Wijzigen spelservers"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Fout"
 
@@ -1930,7 +1930,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2024,7 +2024,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Kleren"
@@ -2176,9 +2176,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2201,8 +2201,8 @@ msgstr "Plaats alles"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2229,8 +2229,8 @@ msgstr "Haal alles op"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2426,8 +2426,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2442,7 +2442,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2820,7 +2820,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4310,7 +4310,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Winkel"
 
@@ -5384,7 +5384,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5395,7 +5395,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5407,7 +5407,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5789,9 +5789,9 @@ msgstr "Spelen"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -5878,7 +5878,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5992,13 +5992,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6006,7 +6006,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6014,7 +6014,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6026,32 +6026,32 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8187,60 +8187,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
@@ -8262,102 +8262,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8367,28 +8367,28 @@ msgstr ""
 "Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
@@ -8409,64 +8409,64 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8598,125 +8598,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8735,21 +8735,21 @@ msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8827,32 +8827,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Geluk:"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 88dae590e..fd31fec7f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -55,10 +55,10 @@ msgstr "Bestand is opgeladen"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "Oké"
 
@@ -490,8 +490,8 @@ msgstr "Help"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -545,10 +545,10 @@ msgstr "Wijzigen spelservers"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Fout"
 
@@ -1930,7 +1930,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2024,7 +2024,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Kleren"
@@ -2176,9 +2176,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2201,8 +2201,8 @@ msgstr "Plaats alles"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Afhalen"
 
@@ -2229,8 +2229,8 @@ msgstr "Haal alles op"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2426,8 +2426,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Neerleggen..."
 
@@ -2442,7 +2442,7 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Neerleggen"
 
@@ -2820,7 +2820,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4310,7 +4310,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Winkel"
 
@@ -5384,7 +5384,7 @@ msgstr "UITR"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Uitrusting"
 
@@ -5395,7 +5395,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventaris"
@@ -5407,7 +5407,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Winkelkar"
@@ -5789,9 +5789,9 @@ msgstr "Spelen"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -5878,7 +5878,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5992,13 +5992,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6006,7 +6006,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6014,7 +6014,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6026,32 +6026,32 @@ msgid "Equip"
 msgstr "Uitrusten"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8187,60 +8187,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
 "server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Onbekende char-server fout."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Kan personage niet aanmaken. Waarschijnlijk bestaat de naam al."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Verkeerde naam."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Ongeldige statistieken."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Ongeldig haar."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personage verwijderd."
 
@@ -8262,102 +8262,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Aanvraag op de stoppen is geweigerd!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Verkeerd wachtwoord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Geweigered door de server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Client is te oud."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8367,28 +8367,28 @@ msgstr ""
 "Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Deze gebruikersnaam is al genomen."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
@@ -8409,64 +8409,64 @@ msgstr "Verbinding met server beëindigd. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Kon personage niet verwijderen."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8598,125 +8598,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Authenticatie gefaald."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Geen servers beschikbaar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Iemand anders is aan het proberen deze account te gebruiken."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Deze account is al ingelogd."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Snelheidshack gedetecteerd."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Verdubbelde login."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Onbekende connectiefout."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8735,21 +8735,21 @@ msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Account was niet gevonden. Probeer opnieuw in te loggen aub."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Oud wachtwoord is ongeldig."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nieuw wachtwoord is te kort."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8827,32 +8827,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Sterkte:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agiliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitaliteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligentie:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Dexteriteit:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Geluk:"
 
diff --git a/po/pl.po b/po/pl.po
index b5658b254..e879c382e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -59,10 +59,10 @@ msgstr "Plik wysłano"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "Ok"
 
@@ -495,8 +495,8 @@ msgstr "Pomoc"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -550,10 +550,10 @@ msgstr "Zmiana serwera"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Błąd"
 
@@ -1398,9 +1398,8 @@ msgstr "Chinese (China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinese (China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1937,7 +1936,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2031,7 +2030,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Stroje"
@@ -2183,9 +2182,9 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Podaj"
 
@@ -2208,8 +2207,8 @@ msgstr "Podaj wszystko"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Pobierz"
 
@@ -2236,8 +2235,8 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2433,8 +2432,8 @@ msgstr "Chroń przedmiot"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Upuść..."
 
@@ -2449,7 +2448,7 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Upuść"
 
@@ -2827,7 +2826,7 @@ msgstr "Poziom: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4321,7 +4320,7 @@ msgstr "Aktywuj powiadomienia dotyczące wagi."
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Sklep"
 
@@ -5396,7 +5395,7 @@ msgstr "EKW"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Ekwipunek"
 
@@ -5407,7 +5406,7 @@ msgstr "INW"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inwentarz"
@@ -5419,7 +5418,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Wózek"
@@ -5801,9 +5800,9 @@ msgstr "Graj"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -5895,7 +5894,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "zwierzątko gracza %s's"
@@ -6009,13 +6008,13 @@ msgid "Did you know..."
 msgstr "Czy wiesz, że..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6023,7 +6022,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Insert"
@@ -6031,7 +6030,7 @@ msgstr "Insert"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6043,32 +6042,32 @@ msgid "Equip"
 msgstr "Załóż"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8206,58 +8205,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Odmowa wstępu. Prawdopodobnie serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Nie można użyć tego ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Nieznany błąd serwera postaci."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Nie udało się stworzyć postaci. Prawdopodobnie imię jest już zajęte."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Nieprawidłowe imię."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Nieprawidłowe staty."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Nieprawidłowe włosy."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Nieprawidłowe miejsce inwentarza."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Nieprawidłowa rasa."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Niewłaściwy wygląd."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Postać skasowana."
 
@@ -8279,102 +8278,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Gra"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Żądanie wyjścia odrzucone!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nazwa gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Przywódca gildii: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Poziom gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Członkowie online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Maksymalna ilość członków: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Przeciętny poziom: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Punkty doświadczenie gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Punkty doświadczenia do następnego poziomu gildii: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Zamek gildii: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Niezarejestrowany ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Nieprawidłowe hasło."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Ważność konta wygasła."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Nie przyjęty przez serwer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Dostałeś/aś dożywotniego bana. Prosimy o kontakt z drużyną GM-ów."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Klient jest zbyt nieaktualny."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8384,28 +8383,28 @@ msgstr ""
 "Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Serwer jest przeciążony."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Login jest już w użyciu."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Nieprawidłowy adres e-mail."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Nieznany błąd."
 
@@ -8426,64 +8425,64 @@ msgstr "Połączenie z serwerem przerwane. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Nie udało się skasować postaci."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8615,125 +8614,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Błąd uwierzytelniania."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Brak dostępnych serwerów."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Ktoś inny próbuje użyć konta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "To konto jest już zalogowane."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Wykryto speed hack."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Zduplikowany login."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Nieznany błąd połączenia."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8752,21 +8751,21 @@ msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Konto nie znalezione. Prosimy się przelogować."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Stare hasło nieprawidłowe."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nowe hasło jest zbyt krótkie."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8844,32 +8843,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s chce handlować z Tobą, zgadzasz się?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Siła:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Szybkość:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Witalność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Inteligencja:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Celność:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Szczęście:"
 
diff --git a/po/pt.po b/po/pt.po
index d619eb1c1..1feb4cb4c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -55,10 +55,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -490,8 +490,8 @@ msgstr "Ajuda"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -545,10 +545,10 @@ msgstr "Mudando servidores do jogo"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Erro"
 
@@ -1399,9 +1399,8 @@ msgstr "Chinês (China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinês (China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1938,7 +1937,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2032,7 +2031,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Roupas"
@@ -2184,9 +2183,9 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2209,8 +2208,8 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2237,8 +2236,8 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2434,8 +2433,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2450,7 +2449,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2828,7 +2827,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4320,7 +4319,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Loja"
 
@@ -5392,7 +5391,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5403,7 +5402,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventário"
@@ -5415,7 +5414,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Carrinho"
@@ -5797,9 +5796,9 @@ msgstr "Jogar"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informações"
 
@@ -5891,7 +5890,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6005,13 +6004,13 @@ msgid "Did you know..."
 msgstr "Você Sabia..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6019,7 +6018,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Inserir"
@@ -6027,7 +6026,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6039,32 +6038,32 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8199,58 +8198,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
@@ -8272,91 +8271,91 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Jogo"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -8364,12 +8363,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8379,28 +8378,28 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Server lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -8421,64 +8420,64 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8610,125 +8609,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8747,21 +8746,21 @@ msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8839,32 +8838,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Sorte:"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0db45863a..acc31472c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -66,10 +66,10 @@ msgstr "Arquivo enviado"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -503,8 +503,8 @@ msgstr "Ajuda"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -558,10 +558,10 @@ msgstr "Mudando de servidor do jogo"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Erro"
 
@@ -1411,9 +1411,8 @@ msgstr "Chinês(China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinês(China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1950,7 +1949,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2044,7 +2043,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Roupas"
@@ -2196,9 +2195,9 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2221,8 +2220,8 @@ msgstr "Guardar tudo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Retirar"
 
@@ -2249,8 +2248,8 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2446,8 +2445,8 @@ msgstr "Proteger item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Descartar..."
 
@@ -2462,7 +2461,7 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Descartar"
 
@@ -2840,7 +2839,7 @@ msgstr "Nível: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4332,7 +4331,7 @@ msgstr "Habilitar notificações de peso"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Loja"
 
@@ -5408,7 +5407,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipamento"
 
@@ -5419,7 +5418,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventário"
@@ -5431,7 +5430,7 @@ msgstr "CA"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Carrinho"
@@ -5813,9 +5812,9 @@ msgstr "Jogar"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Informações"
 
@@ -5907,7 +5906,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "Animal de estimação de %s"
@@ -6021,13 +6020,13 @@ msgid "Did you know..."
 msgstr "Você sabia que ..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6035,7 +6034,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Inserir"
@@ -6043,7 +6042,7 @@ msgstr "Inserir"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6055,32 +6054,32 @@ msgid "Equip"
 msgstr "Equipar"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr "O"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr "C"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr "S"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8215,58 +8214,58 @@ msgid "Npc"
 msgstr "Npc"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Nome errado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Stats incorretos."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Cabelo incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Slot incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Corrida incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Aparência incorreta."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
@@ -8289,91 +8288,91 @@ msgstr ""
 "Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Jogo"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Nome Guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Mestre da guilda: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Nível Guilda: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Membros Online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Max Membros: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Nível médio: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guilda exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guilda prox. exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Castelo Guilda : %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Senha incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "A conta expirou."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
@@ -8381,12 +8380,12 @@ msgstr ""
 "algum GM."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Cliente muito antigo."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8396,28 +8395,28 @@ msgstr ""
 "Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Servidor lotado."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Email incorreto."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
@@ -8438,64 +8437,64 @@ msgstr "Conexão com o servidor interrompida. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Erro ao renomear personagem."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Personagem renomeado."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Não é permitido renomear."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Novo nome não definido."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Personagem não encontrado."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Não é possível conjurar habilidade nesta área."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Não é possível usar item nesta área."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Não é possível equipar. Nível errado."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Não é possível usar. Nível errado."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Trabalho em andamento."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Mensagem não pode ser enviada, canal %s não existe."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Não pode abrir canal. Canal %s não existe."
@@ -8627,125 +8626,125 @@ msgid "Manner"
 msgstr "Etiqueta"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Servidor lotado."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Desculpe, você está abaixo da idade permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Muitas conexões do mesmo IP."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Não pago no momento."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Pagamento suspenso."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Pagamento modificado."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "IP de pagamento errado."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Pagar sala de jogo."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "Desconexão forçada pelo GM."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Ban Japan refuse."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr "Manteve-se outra conta."
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr "IP hostil."
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr "Contagem geral de IP."
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr "Contagem de IP."
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Memória."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr "HAN válido."
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr "Acesso limitado de IP."
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Acima da lista de personagens."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "IP bloqueado."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Contagem de senha inválida."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Raça não permitida."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Mapa não encontrado."
 
@@ -8764,21 +8763,21 @@ msgid "Unknown item"
 msgstr "Item desconhecido"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Conta não encontrada. Por favor, tente novamente."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8856,32 +8855,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Força:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agilidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Destreza:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Sorte:"
 
diff --git a/po/ru.po b/po/ru.po
index b00f6bd5e..83b22802b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 11:28+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 10:03+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
@@ -64,10 +64,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "ОК"
 
@@ -501,8 +501,8 @@ msgstr "Помощь"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -556,10 +556,10 @@ msgstr "Смена игрового сервера"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Ошибка"
 
@@ -1398,7 +1398,7 @@ msgstr "(по умолчанию)"
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:47
 msgid "Catalan"
-msgstr ""
+msgstr "Каталония"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:49
@@ -1407,9 +1407,8 @@ msgstr "Китайский"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Китайский"
+msgstr "Китай (Гонконг)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1494,7 +1493,7 @@ msgstr "Турецкий"
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:85
 msgid "Ukraine"
-msgstr ""
+msgstr "Украина"
 
 #. TRANSLATORS: magic school
 #: src/gui/models/magicschoolmodel.h:35
@@ -1946,7 +1945,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2040,7 +2039,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Наряды"
@@ -2192,9 +2191,9 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Сохранить"
 
@@ -2217,8 +2216,8 @@ msgstr "Сохранить все"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Получить"
 
@@ -2245,8 +2244,8 @@ msgstr "Получить все"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2442,8 +2441,8 @@ msgstr "Поставить защиту"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Бросить..."
 
@@ -2458,7 +2457,7 @@ msgstr "Бросить все"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Бросить"
 
@@ -2836,7 +2835,7 @@ msgstr "Уровень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4328,7 +4327,7 @@ msgstr "Включить напоминание о весе"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Магазин"
 
@@ -5409,7 +5408,7 @@ msgstr "СН"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Снаряжение"
 
@@ -5420,7 +5419,7 @@ msgstr "ИНВ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Инвентарь"
@@ -5432,7 +5431,7 @@ msgstr "ТЕ"
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Телега"
@@ -5814,9 +5813,9 @@ msgstr "Играть"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Сведения"
 
@@ -5908,7 +5907,7 @@ msgid "Broken nick detected: "
 msgstr "Обнаружен некорректный ник: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -6022,13 +6021,13 @@ msgid "Did you know..."
 msgstr "Знаете ли вы..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr "Вставить карту"
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr "Вставить карту %s"
@@ -6036,7 +6035,7 @@ msgstr "Вставить карту %s"
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Вставка"
@@ -6044,7 +6043,7 @@ msgstr "Вставка"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6056,32 +6055,32 @@ msgid "Equip"
 msgstr "Надеть"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr "Н"
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr "П"
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr "М"
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
@@ -8221,60 +8220,60 @@ msgid "Npc"
 msgstr "НИП"
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Нельзя использовать данный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Неизвестная ошибка сервера персонажей."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Некорректное имя."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Некорректные статы."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Некорректный тип волос."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Некорректный слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Неправильная раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Неправильная внешность."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Персонаж удален."
 
@@ -8296,102 +8295,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr "Приватное сообщение не может быть послано. Вас игнорируют все игроки."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Игра"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Запрос на выход отклонен!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Имя гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Мастер гильдии: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Уровень гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Пользователей онлайн: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Макс. членов: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Средний уровень: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Опыт гильдии: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Нужно опыта до следующего уровня: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Замки гильдии: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Незарегистрированный ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Неверный пароль."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Учетная запись просрочена."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Получен отказ от сервера."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Клиент устарел."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8400,28 +8399,28 @@ msgstr ""
 "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Сервер переполнен."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Неправильный email."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Пользователь удален."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Неизвестная ошибка."
 
@@ -8442,64 +8441,64 @@ msgstr "Подключение к серверу прервано. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Ошибка изменения имени персонажа."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Персонаж переименован."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Изменение имени запрещено."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Новое имя не указано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Персонаж не найден."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Невозможно удалить персонажа."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Здесь невозможно выполнить заклинание."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Здесь невозможно использовать предмет."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Невозможно одеть, некорректный уровень."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Невозможно использовать, некорректный уровень."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Идет работа."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Сообщение не может быть отправлено, т.к. канал %s не существует."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Не возможно открыть канал. Канал %s не существует."
@@ -8631,125 +8630,125 @@ msgid "Manner"
 msgstr "Манеры"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Ошибка авторизации."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Нет доступных серверов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже в сети."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Обнаружен взлом скорости."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Сервер переполнен."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "К сожалению вы несовершеннолетний."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Двойная попытка подключения."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Слишком много соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Не оплачено."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Оплата приостановлена."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Оплата изменена."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "Оплачен другой адрес."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Оплатите за комнату."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "ГМ отключил вас от сервера."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Японский бан."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr "Остались другие аккаунты."
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr "Неправильный адрес."
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr "Превышение колчиства соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr "Превышение колчиства соединений с одного адреса."
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Память."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr "Корректный han."
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr "Ограничение по ip адресу."
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Слишком много персонажей."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "IP-адрес заблокирован."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Некорректное число символов в пароле."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Некорректная расса."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Неизвестная ошибка подключения."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Карта не найдена"
 
@@ -8768,21 +8767,21 @@ msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Учетная запись не найдена. Попробуйте снова."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Старый пароль указан неверно."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Новый пароль слишком короткий."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr "Вам пришло сообщение от %s и заголовком %s"
@@ -8860,32 +8859,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Сила (str):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Выносливость (agi):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Живучесть (vit):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Интеллект (int):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Ловкость (dex):"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Удача (luk):"
 
diff --git a/po/sk.po b/po/sk.po
index 5737a4ffa..879ad5996 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,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: Slovak (http://www.transifex.com/akaras/manaplus/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "Potvrdiť"
 
@@ -257,7 +256,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 ""
 #: 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 "Chyba"
 
@@ -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 ""
 #. 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 ""
 
@@ -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 ""
 #. 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 ""
 
@@ -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 ""
@@ -8144,175 +8155,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"
@@ -8320,28 +8331,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 ""
 
@@ -8362,320 +8373,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8683,27 +8693,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 ""
 
 #. 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 ""
@@ -8781,32 +8791,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/sq.po b/po/sq.po
index 30db39635..be6dd2539 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,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: Albanian (http://www.transifex.com/akaras/manaplus/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 ""
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr ""
 #. 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 ""
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr ""
 #. 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 ""
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8680,27 +8690,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 ""
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/sr.po b/po/sr.po
index 91dc5934d..300bad504 100644
--- a/po/sr.po
+++ b/po/sr.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-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -54,10 +54,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "U redu"
 
@@ -490,8 +490,8 @@ msgstr "Pomoć"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -545,10 +545,10 @@ msgstr "Menjam server igre"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Greška"
 
@@ -1928,7 +1928,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2022,7 +2022,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr ""
@@ -2174,9 +2174,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
@@ -2199,8 +2199,8 @@ msgstr "Sačuvaj sve"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
@@ -2227,8 +2227,8 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2424,8 +2424,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
@@ -2440,7 +2440,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
@@ -2818,7 +2818,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4310,7 +4310,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr ""
 
@@ -5378,7 +5378,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Oprema"
 
@@ -5389,7 +5389,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Lista predmeta"
@@ -5401,7 +5401,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5783,9 +5783,9 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr ""
 
@@ -5872,7 +5872,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5986,13 +5986,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6000,7 +6000,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6008,7 +6008,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6020,32 +6020,32 @@ msgid "Equip"
 msgstr "Obuci"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8181,58 +8181,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8254,102 +8254,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8357,28 +8357,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr ""
 
@@ -8399,64 +8399,64 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8588,125 +8588,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8725,21 +8725,21 @@ msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8817,32 +8817,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 1ce082b83..6978fc64f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -52,10 +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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -487,8 +487,8 @@ msgstr "Hjälp"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -542,10 +542,10 @@ msgstr "Ändrar spelserver"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Error"
 
@@ -1390,9 +1390,8 @@ msgstr "Kinesiska (Du vet Kina)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Kinesiska (Du vet Kina)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1929,7 +1928,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2023,7 +2022,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -2175,9 +2174,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Lagra"
 
@@ -2200,8 +2199,8 @@ msgstr "Lagra alla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2228,8 +2227,8 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2425,8 +2424,8 @@ msgstr "Skydda item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2441,7 +2440,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Släng"
 
@@ -2819,7 +2818,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4311,7 +4310,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Shop"
 
@@ -5384,7 +5383,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5395,7 +5394,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventory"
@@ -5407,7 +5406,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Cart"
@@ -5789,9 +5788,9 @@ msgstr "Spela"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -5883,7 +5882,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5999,13 +5998,13 @@ msgid "Did you know..."
 msgstr "Viste du att..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6013,7 +6012,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6021,7 +6020,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6033,32 +6032,32 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8194,60 +8193,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
 "taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
@@ -8269,103 +8268,103 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Efterfrågning att avsluta nekad!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Guild-namn: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Guild master: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Guild level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Medlemmar online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Maximalt antal medlemmar: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Medel-level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guild exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guild nästa exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8375,28 +8374,28 @@ msgstr ""
 "teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Okänt fel."
 
@@ -8417,64 +8416,64 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8606,125 +8605,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8743,21 +8742,21 @@ msgid "Unknown item"
 msgstr "Okänt item"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Gamla lösenordet är felaktigt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8835,32 +8834,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Strength:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agility:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Luck:"
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1ce082b83..6978fc64f 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -52,10 +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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "OK"
 
@@ -487,8 +487,8 @@ msgstr "Hjälp"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -542,10 +542,10 @@ msgstr "Ändrar spelserver"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Error"
 
@@ -1390,9 +1390,8 @@ msgstr "Kinesiska (Du vet Kina)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Kinesiska (Du vet Kina)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1929,7 +1928,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2023,7 +2022,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Utstyrsel"
@@ -2175,9 +2174,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Lagra"
 
@@ -2200,8 +2199,8 @@ msgstr "Lagra alla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Ta emot"
 
@@ -2228,8 +2227,8 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2425,8 +2424,8 @@ msgstr "Skydda item"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Släng..."
 
@@ -2441,7 +2440,7 @@ msgstr "Släng allt"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Släng"
 
@@ -2819,7 +2818,7 @@ msgstr "Level: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4311,7 +4310,7 @@ msgstr "Aktivera vikt-notationer"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Shop"
 
@@ -5384,7 +5383,7 @@ msgstr "EQU"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Equipment"
 
@@ -5395,7 +5394,7 @@ msgstr "INV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Inventory"
@@ -5407,7 +5406,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Cart"
@@ -5789,9 +5788,9 @@ msgstr "Spela"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Info"
 
@@ -5883,7 +5882,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5999,13 +5998,13 @@ msgid "Did you know..."
 msgstr "Viste du att..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6013,7 +6012,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6021,7 +6020,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6033,32 +6032,32 @@ msgid "Equip"
 msgstr "Equip"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8194,60 +8193,60 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Åtkomst nekad. Trolig orsak; det är för många spelare på denna server."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Kan inte använda detta ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
 "taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Fel namn."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Icke korrekta stats."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Icke korrekt hår."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Icke korrekt slot."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Felaktig race."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Icke korrekt utseende."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Karaktär raderad."
 
@@ -8269,103 +8268,103 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Spel"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Efterfrågning att avsluta nekad!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Guild-namn: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Guild master: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Guild level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Medlemmar online: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Maximalt antal medlemmar: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Medel-level: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Guild exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Guild nästa exp: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Guild slott: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Oregistrerat ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Fel lösenord."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Kotot har löpt ut ur tid."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Nekad från servern."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Klienten är uråldrig."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8375,28 +8374,28 @@ msgstr ""
 "teamet via forumet."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Servern är överbefolkad."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Detta användarnamn är redan taget."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Felaktig epost."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Användarnamnet är permanent raderat."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Okänt fel."
 
@@ -8417,64 +8416,64 @@ msgstr "Anslutningen till servern avslutad. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Misslyckades att radera karaktär."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8606,125 +8605,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Inga servrar tillgängliga."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Någon annan försöker använda detta konto."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Detta konto är redan inloggat."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Speed hack upptäckt."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Duplicerad Inloggning."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Okänt anslutningsfel."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8743,21 +8742,21 @@ msgid "Unknown item"
 msgstr "Okänt item"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Kontot hittades inte. Vänligen logga ut och logga in igen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Gamla lösenordet är felaktigt."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Det nya lösenordet är för kort."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8835,32 +8834,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill trade:a med dig, accepterar du?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Strength:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Agility:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Vitality:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Intelligence:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Dexterity:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Luck:"
 
diff --git a/po/te.po b/po/te.po
index e74b6e397..e2782164a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,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: Telugu (http://www.transifex.com/akaras/manaplus/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "సరే"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -542,12 +541,10 @@ msgstr ""
 #: 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 "పొరపాటు"
 
@@ -1380,89 +1377,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"
@@ -1736,8 +1748,8 @@ msgstr ""
 #. 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 ""
 
@@ -3787,7 +3799,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
@@ -5739,10 +5751,9 @@ msgstr ""
 #. 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 ""
 
@@ -5829,7 +5840,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 ""
@@ -8141,175 +8152,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"
@@ -8317,28 +8328,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 ""
 
@@ -8359,320 +8370,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8680,27 +8690,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 ""
 
 #. 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 ""
@@ -8778,32 +8788,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/th.po b/po/th.po
index 3ba50d43c..221cac5a9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,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: Thai (http://www.transifex.com/akaras/manaplus/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 ""
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -541,12 +540,10 @@ msgstr ""
 #: 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 "ผิดพลาด"
 
@@ -1379,89 +1376,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"
@@ -1735,8 +1747,8 @@ msgstr ""
 #. 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 ""
 
@@ -3786,7 +3798,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
@@ -5738,10 +5750,9 @@ msgstr ""
 #. 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 ""
 
@@ -5828,7 +5839,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 ""
@@ -8138,175 +8149,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"
@@ -8314,28 +8325,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 ""
 
@@ -8356,320 +8367,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8677,27 +8687,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 ""
 
 #. 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 ""
@@ -8775,32 +8785,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/tr.po b/po/tr.po
index 04e3c6f0d..05165d1b9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -54,10 +54,10 @@ msgstr "Dosya yüklendi"
 #: 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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "TAMAM"
 
@@ -489,8 +489,8 @@ msgstr "Yardım"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -544,10 +544,10 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Hata"
 
@@ -1393,9 +1393,8 @@ msgstr "Chinese (China)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Chinese (China)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1932,7 +1931,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2026,7 +2025,7 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Kıyafetler"
@@ -2178,9 +2177,9 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Sakla"
 
@@ -2203,8 +2202,8 @@ msgstr "Tamamını sakla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Geri al"
 
@@ -2231,8 +2230,8 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2428,8 +2427,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Bırak..."
 
@@ -2444,7 +2443,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Bırak"
 
@@ -2822,7 +2821,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4315,7 +4314,7 @@ msgstr "Ağırlık bildirimlerini etkinleştir"
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Mağaza"
 
@@ -5383,7 +5382,7 @@ msgstr "EKP"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Ekipman"
 
@@ -5394,7 +5393,7 @@ msgstr "ENV"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Envanter"
@@ -5406,7 +5405,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5788,9 +5787,9 @@ msgstr "Oyna"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Bilgi"
 
@@ -5877,7 +5876,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5991,13 +5990,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6005,7 +6004,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6013,7 +6012,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6025,32 +6024,32 @@ msgid "Equip"
 msgstr "Donatmak"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8186,58 +8185,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Yanlış yer."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8259,102 +8258,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Hesap silinmiş."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8362,28 +8361,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Bilinemeyen hata."
 
@@ -8404,64 +8403,64 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8593,125 +8592,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Başka birisi bu hesabı kullanmaya çalışıyor."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Zaten bu hesaba bağlanıldı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8730,21 +8729,21 @@ msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Hesap bulunamadı. Lütfen tekrar giriş yapın."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Eski şifre hatalı."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8822,32 +8821,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s sana takas isteği yolladı, kabul ediyor musun?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Güç:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Çeviklik:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Yaşam Gücü:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Zeka:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Maharet:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 6229c7643..3c99ccefd 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -55,10 +55,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "ОК"
 
@@ -493,8 +493,8 @@ msgstr "Довідка"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -548,10 +548,10 @@ msgstr "Зміна ігрового серверу..."
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "Помилка"
 
@@ -1397,9 +1397,8 @@ msgstr "Китайська (Китай)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "Китайська (Китай)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1936,7 +1935,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2030,7 +2029,7 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "Швидке спорядження"
@@ -2182,9 +2181,9 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "Зберегти"
 
@@ -2207,8 +2206,8 @@ msgstr "Зберегти всю кількість"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "Вилучити"
 
@@ -2235,8 +2234,8 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2432,8 +2431,8 @@ msgstr "Захистити предмет"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Кинути..."
 
@@ -2448,7 +2447,7 @@ msgstr "Кинути все"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Кинути"
 
@@ -2826,7 +2825,7 @@ msgstr "Рівень: %u"
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4318,7 +4317,7 @@ msgstr "Повідомляти про вагове перенавантажен�
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "Крамниця"
 
@@ -5391,7 +5390,7 @@ msgstr "СПР"
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "Спорядження"
 
@@ -5402,7 +5401,7 @@ msgstr "СУМ"
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "Сумка"
@@ -5414,7 +5413,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr "Візок"
@@ -5796,9 +5795,9 @@ msgstr "Увійти"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "Відомості"
 
@@ -5890,7 +5889,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr "%s'ів улюбленець"
@@ -6004,13 +6003,13 @@ msgid "Did you know..."
 msgstr "Чи вам відомо..."
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6018,7 +6017,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr "Вставити"
@@ -6026,7 +6025,7 @@ msgstr "Вставити"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6038,32 +6037,32 @@ msgid "Equip"
 msgstr "Вдягнути"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8199,58 +8198,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Доступ заборонений. Скоріше за все, зараз не ньому забагато гравців."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr "Неможливо вжити цей ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr "Невідома помилка серверу персонажів."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Неможливо створити персонажа. Скоріше за все, хтось вже так назвався."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "Некоректне ім'я."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "Невірні характеристики."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "Невірна зачіска."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr "Невірний слот."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr "Невірна раса."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr "Невірний вигляд."
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "Персонаж видалено."
 
@@ -8272,102 +8271,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr "Неможливо надіслати приватне повідомлення, вас ігнорують всі гравці."
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "Назва"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr "Позив до виходу відхилено!"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr "Назва гільдії: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "Володар гільдії: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "Рівень гільдії: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "Членів онлайн: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "Максимум членів: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "Середній рівень: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "Досвід гільдії: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "Досвід до наступного рівня: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr "Замок гільдії: %s"
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "Не зареєстрований ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "Неправильний пароль."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "Акаунт прострочено."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr "Отримана відмова від серверу."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "Вас було навіки забанено. Пишіть листи команді ГМ'ів."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "Клієнт застарий."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8377,28 +8376,28 @@ msgstr ""
 "Звертайтесь до команди ГМ'ів на форумі."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr "Сервер перенаселено."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr "Цей логін все є чиїмось."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr "Некоректна електронна пошта."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr "Користувач стертий."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "Невстановлена помилка."
 
@@ -8419,64 +8418,64 @@ msgstr "З'єднання з сервером припинене. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr "Помилка переіменування персонажу."
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr "Персонаж переіменовано."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr "Переіменування не дозволене."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr "Нове ім'я не вжито."
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr "Персонаж не знайдено."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "Неможливо видалити персонаж."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr "Неможливо використати вміння у цій місцевості."
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr "Неможливо використати цей предмет у цій місцевості."
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr "Неможливо вдягнути. Неправильний рівень."
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr "Неможливо вжити. Неправильний рівень."
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr "Чекаємо на результат."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr "Неможливо відправити повідомлення, канал %s не існує."
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr "Неможливо відкрити канал, канал %s не існує."
@@ -8608,125 +8607,125 @@ msgid "Manner"
 msgstr "Манери"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "Аутентифікація не вдалася."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "Немає доступних серверів."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "Хтось інший намагається використати цей акаунт."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "Цей акаунт все знаходиться у грі."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "Виявлено перевищення швидкісних лімітів."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr "Сервер повний."
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr "Даруйте, але в вас недостатньо віку."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "Дубльований логін."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr "Забагато з'єднань з того ж самого IP."
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr "Не оплачуване."
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr "Оплату призупинено."
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr "Оплату змінено."
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr "Оплачувано інший IP."
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr "Оплатіть кімнату."
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr "ГМ відключив вас від серверу."
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr "Японський бан."
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr "Залишились інші акаунти."
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr "Неправильна адреса."
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr "Перевищення з'єднань з однієї адреси."
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr "Перевищення з'єднань з однієї адреси."
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr "Пам'ять."
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr "Коректний HAN."
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr "Обмеження IP доступу."
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr "Забагато персонажів."
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr "IP-адреса заблокована."
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr "Некоректний розмір паролю."
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr "Недозволена раса."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "Невідома помилка з'єднання."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr "Мапу не знайдено."
 
@@ -8745,21 +8744,21 @@ msgid "Unknown item"
 msgstr "Невідомий предмет"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "Акаунт не знайдено. Будь ласка, спробуйте знов."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "Старий пароль некоректний."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "Новий пароль замалий."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8837,32 +8836,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s бажає торгуватись, чи ви згодні?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "Сила:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "Спритність:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "Витривалість:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "Інтелект:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "Вправність:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "Талан:"
 
diff --git a/po/vls.po b/po/vls.po
index 0e92fb3ba..8484af52a 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,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: Vlaams (http://www.transifex.com/akaras/manaplus/language/vls/)\n"
 "MIME-Version: 1.0\n"
@@ -50,11 +50,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 ""
 
@@ -256,7 +255,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -541,12 +540,10 @@ msgstr ""
 #: 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 ""
 
@@ -1379,89 +1376,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"
@@ -1735,8 +1747,8 @@ msgstr ""
 #. 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 ""
 
@@ -3786,7 +3798,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
@@ -5738,10 +5750,9 @@ msgstr ""
 #. 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 ""
 
@@ -5828,7 +5839,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 ""
@@ -8140,175 +8151,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"
@@ -8316,28 +8327,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 ""
 
@@ -8358,320 +8369,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
-msgid "Authentication failed."
+#: src/net/eathena/generalhandler.cpp:249 src/net/tmwa/generalhandler.cpp:270
+msgid "Got disconnected from server!"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
-msgid "No servers available."
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:180 src/net/tmwa/generalhandler.cpp:196
-msgid "Someone else is trying to use this account."
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:202
-msgid "This account is already logged in."
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:189 src/net/tmwa/generalhandler.cpp:207
-msgid "Speed hack detected."
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:192
-msgid "Server full."
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:195
-msgid "Sorry, you are underaged."
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:198 src/net/tmwa/generalhandler.cpp:211
-msgid "Duplicated login."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+msgid "Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:201
-msgid "To many connections from same ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:204
-msgid "Not paid for this time."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:288 src/net/tmwa/generalhandler.cpp:320
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:207
-msgid "Pay suspended."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#, no-c-format
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:210
-msgid "Pay changed."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:326
+#, no-c-format
+msgid "% Evade"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:213
-msgid "Pay wrong ip."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:329
+#, no-c-format
+msgid "% Critical"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:216
-msgid "Pay game room."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:295 src/net/tmwa/generalhandler.cpp:331
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:219
-msgid "Disconnect forced by GM."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:223
-msgid "Ban japan refuse."
+#. TRANSLATORS: player stat
+#: src/net/eathena/generalhandler.cpp:297 src/net/tmwa/generalhandler.cpp:335
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:226
-msgid "Remained other account."
+#. 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:229
-msgid "Ip unfair."
+#: src/net/eathena/generalhandler.cpp:299
+msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:232
-msgid "Ip count all."
+#: src/net/eathena/generalhandler.cpp:300
+msgid "Manner"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:235
-msgid "Ip count."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:239
-msgid "Memory."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+msgid "No servers available."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:242
-msgid "Han valid."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:245
-msgid "Ip limited access."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:248
-msgid "Over characters list."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:251
-msgid "Ip blocked."
+#: src/net/eathena/generalrecv.cpp:111
+msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:254
-msgid "Invalid password count."
+#: src/net/eathena/generalrecv.cpp:114
+msgid "Sorry, you are underaged."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:257
-msgid "Not allowed race."
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+msgid "Duplicated login."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:260 src/net/tmwa/generalhandler.cpp:215
-msgid "Unknown connection error."
+#: src/net/eathena/generalrecv.cpp:120
+msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:270
-msgid "Map not found"
+#: src/net/eathena/generalrecv.cpp:123
+msgid "Not paid for this time."
 msgstr ""
 
-#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:360 src/net/tmwa/generalhandler.cpp:315
-msgid "Got disconnected from server!"
+#: src/net/eathena/generalrecv.cpp:126
+msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
+#: src/net/eathena/generalrecv.cpp:129
+msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
+#: src/net/eathena/generalrecv.cpp:132
+msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
+#: src/net/eathena/generalrecv.cpp:135
+msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
+#: src/net/eathena/generalrecv.cpp:138
+msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
+#: src/net/eathena/generalrecv.cpp:142
+msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
+#: src/net/eathena/generalrecv.cpp:145
+msgid "Remained other account."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:361
-msgid "Defense"
+#: src/net/eathena/generalrecv.cpp:148
+msgid "Ip unfair."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:363
-msgid "M.Attack"
+#: src/net/eathena/generalrecv.cpp:151
+msgid "Ip count all."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:365
-msgid "M.Defense"
+#: src/net/eathena/generalrecv.cpp:154
+msgid "Ip count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:368
-#, no-c-format
-msgid "% Accuracy"
+#: src/net/eathena/generalrecv.cpp:158
+msgid "Memory."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:371
-#, no-c-format
-msgid "% Evade"
+#: src/net/eathena/generalrecv.cpp:161
+msgid "Han valid."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:405 src/net/tmwa/generalhandler.cpp:374
-#, no-c-format
-msgid "% Critical"
+#: src/net/eathena/generalrecv.cpp:164
+msgid "Ip limited access."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:376
-msgid "Attack Delay"
+#: src/net/eathena/generalrecv.cpp:167
+msgid "Over characters list."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:378
-msgid "Walk Delay"
+#: src/net/eathena/generalrecv.cpp:170
+msgid "Ip blocked."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:380
-msgid "Attack Range"
+#: src/net/eathena/generalrecv.cpp:173
+msgid "Invalid password count."
 msgstr ""
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:382
-msgid "Damage per sec."
+#: src/net/eathena/generalrecv.cpp:176
+msgid "Not allowed race."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:410
-msgid "Karma"
+#. TRANSLATORS: error message
+#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:411
-msgid "Manner"
+#: src/net/eathena/generalrecv.cpp:189
+msgid "Map not found"
 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 ""
@@ -8679,27 +8689,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 ""
 
 #. 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 ""
@@ -8777,32 +8787,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. 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 ""
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fcbd48832..084fbfa65 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-08-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-23 09:14+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -59,10 +59,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "确定"
 
@@ -493,8 +493,8 @@ msgstr "帮助"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -548,10 +548,10 @@ msgstr "正在更改游戏服务器"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "错误"
 
@@ -1931,7 +1931,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2025,7 +2025,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr "套装"
@@ -2177,9 +2177,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr "存储"
 
@@ -2202,8 +2202,8 @@ msgstr "商店所有"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr "取回"
 
@@ -2230,8 +2230,8 @@ msgstr "检索所有"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2427,8 +2427,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "掉落..."
 
@@ -2443,7 +2443,7 @@ msgstr "所有"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丢弃"
 
@@ -2821,7 +2821,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4311,7 +4311,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "商店"
 
@@ -5379,7 +5379,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "装备"
 
@@ -5390,7 +5390,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "物品栏"
@@ -5402,7 +5402,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5784,9 +5784,9 @@ msgstr "开始"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr "信息"
 
@@ -5873,7 +5873,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5987,13 +5987,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -6001,7 +6001,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6009,7 +6009,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6021,32 +6021,32 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8178,58 +8178,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "访问被拒绝。最有可能的，也有太多的球员，在此服务器上."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "创建角色失败。很可能名称已被占用."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr "错误的名称."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr "不正确的统计."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr "不正确的头发."
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr "角色已删除."
 
@@ -8251,102 +8251,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr "游戏"
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr "未注册的ID."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr "错误的密码."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr "账户过期失效."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr "您已被永久禁止进入游戏。请联系GM团队."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr "客户端太旧."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8356,28 +8356,28 @@ msgstr ""
 "请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr "未知的错误."
 
@@ -8398,64 +8398,64 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr "删除角色失败."
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8587,125 +8587,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr "重复登录."
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8724,21 +8724,21 @@ msgid "Unknown item"
 msgstr "未知物品"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr "帐号不存在。请重新登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr "旧密码不正确."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr "新密码太短."
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8816,32 +8816,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr "力量:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr "敏捷:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr "生命:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr "智力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr "灵巧:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr "幸运:"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 051cf5e2c..2dc653657 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.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-28 03:37+0300\n"
-"PO-Revision-Date: 2015-08-28 00:18+0000\n"
+"POT-Creation-Date: 2015-08-29 17:09+0300\n"
+"PO-Revision-Date: 2015-08-29 09:19+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -53,10 +53,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/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
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:379
+#: src/net/eathena/charserverrecv.cpp:414
+#: src/net/eathena/charserverrecv.cpp:442 src/net/tmwa/charserverrecv.cpp:281
 msgid "OK"
 msgstr "確定"
 
@@ -487,8 +487,8 @@ msgstr "說明"
 #: src/dyetool/client.cpp:489 src/gui/dialogsmanager.cpp:116
 #: src/gui/popups/popupmenu.cpp:738 src/gui/popups/popupmenu.cpp:979
 #: src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:270
-#: src/gui/windows/inventorywindow.cpp:294
+#: src/gui/windows/inventorywindow.cpp:268
+#: src/gui/windows/inventorywindow.cpp:292
 #: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:59
 #: src/gui/windows/npcdialog.cpp:76 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:112
@@ -542,10 +542,10 @@ msgstr "正在轉換遊戲伺服器"
 #: 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/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
+#: src/gui/windows/unregisterdialog.cpp:146 src/net/ea/charserverrecv.cpp:105
+#: src/net/eathena/charserverrecv.cpp:352
+#: src/net/eathena/charserverrecv.cpp:356
+#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:277
 msgid "Error"
 msgstr "錯誤"
 
@@ -1387,9 +1387,8 @@ msgstr "中文 (中國)"
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:51
-#, fuzzy
 msgid "Chinese (Hong Kong)"
-msgstr "中文 (中國)"
+msgstr ""
 
 #. TRANSLATORS: language
 #: src/gui/models/langlistmodel.h:53
@@ -1926,7 +1925,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:356 src/gui/windows/equipmentwindow.cpp:72
-#: src/gui/windows/inventorywindow.cpp:205 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:203 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -2020,7 +2019,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:680 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:234
+#: src/gui/windowmenu.cpp:143 src/gui/windows/inventorywindow.cpp:232
 #: src/gui/windows/outfitwindow.cpp:58
 msgid "Outfits"
 msgstr ""
@@ -2172,9 +2171,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1667 src/gui/popups/popupmenu.cpp:1819
-#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:265
-#: src/gui/windows/inventorywindow.cpp:289
-#: src/gui/windows/inventorywindow.cpp:887 src/gui/windows/setupwindow.cpp:101
+#: src/gui/popups/popupmenu.cpp:1860 src/gui/windows/inventorywindow.cpp:263
+#: src/gui/windows/inventorywindow.cpp:287
+#: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:101
 msgid "Store"
 msgstr ""
 
@@ -2197,8 +2196,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:267
-#: src/gui/windows/inventorywindow.cpp:291
+#: src/gui/popups/popupmenu.cpp:1698 src/gui/windows/inventorywindow.cpp:265
+#: src/gui/windows/inventorywindow.cpp:289
 msgid "Retrieve"
 msgstr ""
 
@@ -2225,8 +2224,8 @@ msgstr ""
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1780 src/gui/popups/popupmenu.cpp:2582
-#: src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:776 src/gui/windows/skilldialog.cpp:77
+#: src/gui/windows/inventorywindow.cpp:201
+#: src/gui/windows/inventorywindow.cpp:774 src/gui/windows/skilldialog.cpp:77
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2422,8 +2421,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:218
-#: src/gui/windows/inventorywindow.cpp:895
+#: src/gui/popups/popupmenu.cpp:2597 src/gui/windows/inventorywindow.cpp:216
+#: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
@@ -2438,7 +2437,7 @@ msgstr ""
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2606 src/gui/windowmenu.cpp:128
-#: src/gui/windows/inventorywindow.cpp:900
+#: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丟棄"
 
@@ -2816,7 +2815,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:692 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:690 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:239 src/gui/windows/statuswindow.cpp:351
 #, c-format
 msgid "Money: %s"
@@ -4306,7 +4305,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:238
+#: src/gui/windows/inventorywindow.cpp:236
 msgid "Shop"
 msgstr "商店"
 
@@ -5374,7 +5373,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:94 src/gui/windows/equipmentwindow.cpp:65
-#: src/gui/windows/inventorywindow.cpp:240
+#: src/gui/windows/inventorywindow.cpp:238
 msgid "Equipment"
 msgstr "裝備"
 
@@ -5385,7 +5384,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:149
+#: src/gui/windowmenu.cpp:97 src/gui/windows/inventorywindow.cpp:147
 #: src/inventory.cpp:304
 msgid "Inventory"
 msgstr "背包"
@@ -5397,7 +5396,7 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:236
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:234
 #: src/inventory.cpp:320
 msgid "Cart"
 msgstr ""
@@ -5779,9 +5778,9 @@ msgstr "開始"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:132
-#: src/net/eathena/charserverrecv.cpp:373
-#: src/net/eathena/charserverrecv.cpp:409
+#: src/gui/windows/charselectdialog.cpp:79 src/net/ea/charserverrecv.cpp:130
+#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:411
 msgid "Info"
 msgstr ""
 
@@ -5868,7 +5867,7 @@ msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:69
+#: src/gui/windows/chatwindow.cpp:1755 src/net/eathena/petrecv.cpp:67
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -5982,13 +5981,13 @@ msgid "Did you know..."
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:46
+#: src/gui/windows/insertcarddialog.cpp:45
 msgid "Insert card"
 msgstr ""
 
 #. TRANSLATORS: insert card dialog name
-#: src/gui/windows/insertcarddialog.cpp:50
-#: src/gui/windows/insertcarddialog.cpp:56
+#: src/gui/windows/insertcarddialog.cpp:49
+#: src/gui/windows/insertcarddialog.cpp:55
 #, c-format
 msgid "Insert card %s"
 msgstr ""
@@ -5996,7 +5995,7 @@ msgstr ""
 #. TRANSLATORS: insert card dialog button
 #. TRANSLATORS: input action name
 #. TRANSLATORS: inventory button
-#: src/gui/windows/insertcarddialog.cpp:64 src/input/pages/gui.cpp:121
+#: src/gui/windows/insertcarddialog.cpp:63 src/input/pages/gui.cpp:121
 #: src/resources/itemtypemapdata.h:97
 msgid "Insert"
 msgstr ""
@@ -6004,7 +6003,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:201 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/inventorywindow.cpp:199 src/gui/windows/outfitwindow.cpp:65
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -6016,32 +6015,32 @@ msgid "Equip"
 msgstr "裝備"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windows/inventorywindow.cpp:218
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:222
+#: src/gui/windows/inventorywindow.cpp:220
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:222
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:224
 msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1035
+#: src/gui/windows/inventorywindow.cpp:1033
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1037
+#: src/gui/windows/inventorywindow.cpp:1035
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -8173,58 +8172,58 @@ msgid "Npc"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:52
+#: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:57
+#: src/net/ea/charserverrecv.cpp:55
 msgid "Cannot use this ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:61
+#: src/net/ea/charserverrecv.cpp:59
 msgid "Unknown char-server failure."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:77
+#: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:82 src/net/ea/loginrecv.cpp:162
-#: src/net/eathena/loginrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:161
+#: src/net/eathena/loginrecv.cpp:98
 msgid "Wrong name."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:86
+#: src/net/ea/charserverrecv.cpp:84
 msgid "Incorrect stats."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:90
+#: src/net/ea/charserverrecv.cpp:88
 msgid "Incorrect hair."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:94
+#: src/net/ea/charserverrecv.cpp:92
 msgid "Incorrect slot."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:98
+#: src/net/ea/charserverrecv.cpp:96
 msgid "Incorrect race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/charserverrecv.cpp:102
+#: src/net/ea/charserverrecv.cpp:100
 msgid "Incorrect look."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/charserverrecv.cpp:132
 msgid "Character deleted."
 msgstr ""
 
@@ -8246,102 +8245,102 @@ msgid "Whisper could not be sent, you ignored by all players."
 msgstr ""
 
 #. TRANSLATORS: error header
-#: src/net/ea/gamerecv.cpp:68
+#: src/net/ea/gamerecv.cpp:67
 msgid "Game"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/gamerecv.cpp:70
+#: src/net/ea/gamerecv.cpp:69
 msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:115
+#: src/net/ea/guildrecv.cpp:116
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:118
+#: src/net/ea/guildrecv.cpp:119
 #, c-format
 msgid "Guild master: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:121
+#: src/net/ea/guildrecv.cpp:122
 #, c-format
 msgid "Guild level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:124
+#: src/net/ea/guildrecv.cpp:125
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:127
+#: src/net/ea/guildrecv.cpp:128
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:130
+#: src/net/ea/guildrecv.cpp:131
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:133
+#: src/net/ea/guildrecv.cpp:134
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:136
+#: src/net/ea/guildrecv.cpp:137
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildrecv.cpp:139
+#: src/net/ea/guildrecv.cpp:140
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:122 src/net/eathena/loginrecv.cpp:57
+#: src/net/ea/loginrecv.cpp:121 src/net/eathena/loginrecv.cpp:53
 msgid "Unregistered ID."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:126 src/net/eathena/loginrecv.cpp:61
+#: src/net/ea/loginrecv.cpp:125 src/net/eathena/loginrecv.cpp:57
 msgid "Wrong password."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:131 src/net/eathena/loginrecv.cpp:66
+#: src/net/ea/loginrecv.cpp:130 src/net/eathena/loginrecv.cpp:62
 msgid "Account expired."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:135 src/net/eathena/loginrecv.cpp:70
+#: src/net/ea/loginrecv.cpp:134 src/net/eathena/loginrecv.cpp:66
 msgid "Rejected from server."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:139 src/net/eathena/loginrecv.cpp:74
+#: src/net/ea/loginrecv.cpp:138 src/net/eathena/loginrecv.cpp:70
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:144 src/net/eathena/loginrecv.cpp:79
+#: src/net/ea/loginrecv.cpp:143 src/net/eathena/loginrecv.cpp:75
 msgid "Client too old."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:148 src/net/eathena/loginrecv.cpp:83
+#: src/net/ea/loginrecv.cpp:147 src/net/eathena/loginrecv.cpp:79
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -8349,28 +8348,28 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:154 src/net/eathena/loginrecv.cpp:92
+#: src/net/ea/loginrecv.cpp:153 src/net/eathena/loginrecv.cpp:88
 msgid "Server overpopulated."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:158 src/net/eathena/loginrecv.cpp:97
+#: src/net/ea/loginrecv.cpp:157 src/net/eathena/loginrecv.cpp:93
 msgid "This user name is already taken."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:166 src/net/eathena/loginrecv.cpp:107
+#: src/net/ea/loginrecv.cpp:165 src/net/eathena/loginrecv.cpp:103
 msgid "Incorrect email."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:170 src/net/eathena/loginrecv.cpp:112
+#: src/net/ea/loginrecv.cpp:169 src/net/eathena/loginrecv.cpp:108
 msgid "Username permanently erased."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/ea/loginrecv.cpp:174 src/net/eathena/loginrecv.cpp:116
-#: src/net/eathena/loginrecv.cpp:194 src/net/tmwa/loginrecv.cpp:123
+#: src/net/ea/loginrecv.cpp:173 src/net/eathena/loginrecv.cpp:112
+#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
 msgid "Unknown error."
 msgstr ""
 
@@ -8391,64 +8390,64 @@ msgstr ""
 
 #. TRANSLATORS: error message
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:352
-#: src/net/eathena/charserverrecv.cpp:400
+#: src/net/eathena/charserverrecv.cpp:354
+#: src/net/eathena/charserverrecv.cpp:402
 msgid "Character rename error."
 msgstr ""
 
 #. TRANSLATORS: info message
-#: src/net/eathena/charserverrecv.cpp:375
+#: src/net/eathena/charserverrecv.cpp:377
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:391
+#: src/net/eathena/charserverrecv.cpp:393
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:395
+#: src/net/eathena/charserverrecv.cpp:397
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverrecv.cpp:404
+#: src/net/eathena/charserverrecv.cpp:406
 msgid "Character not found."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/charserverrecv.cpp:438 src/net/tmwa/charserverrecv.cpp:281
+#: src/net/eathena/charserverrecv.cpp:440 src/net/tmwa/charserverrecv.cpp:279
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:139
+#: src/net/eathena/chatrecv.cpp:135
 msgid "Can't cast skill in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:142
+#: src/net/eathena/chatrecv.cpp:138
 msgid "Can't use item in this area."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:145
+#: src/net/eathena/chatrecv.cpp:141
 msgid "Can't equip. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:148
+#: src/net/eathena/chatrecv.cpp:144
 msgid "Can't use. Wrong level."
 msgstr ""
 
-#: src/net/eathena/chatrecv.cpp:151
+#: src/net/eathena/chatrecv.cpp:147
 msgid "Work in progress."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:331
+#: src/net/eathena/chatrecv.cpp:327
 #, c-format
 msgid "Message could not be sent, channel %s is not exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/net/eathena/chatrecv.cpp:453
+#: src/net/eathena/chatrecv.cpp:449
 #, c-format
 msgid "Can't open channel. Channel %s is not exists."
 msgstr ""
@@ -8580,125 +8579,125 @@ msgid "Manner"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:91 src/net/tmwa/generalrecv.cpp:97
+#: src/net/eathena/generalrecv.cpp:48 src/net/tmwa/generalrecv.cpp:49
 msgid "Authentication failed."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:94 src/net/tmwa/generalrecv.cpp:101
+#: src/net/eathena/generalrecv.cpp:51 src/net/tmwa/generalrecv.cpp:53
 msgid "No servers available."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:99 src/net/tmwa/generalrecv.cpp:107
+#: src/net/eathena/generalrecv.cpp:56 src/net/tmwa/generalrecv.cpp:59
 msgid "Someone else is trying to use this account."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:104 src/net/tmwa/generalrecv.cpp:113
+#: src/net/eathena/generalrecv.cpp:61 src/net/tmwa/generalrecv.cpp:65
 msgid "This account is already logged in."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:108 src/net/tmwa/generalrecv.cpp:118
+#: src/net/eathena/generalrecv.cpp:65 src/net/tmwa/generalrecv.cpp:70
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:111
+#: src/net/eathena/generalrecv.cpp:68
 msgid "Server full."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:114
+#: src/net/eathena/generalrecv.cpp:71
 msgid "Sorry, you are underaged."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:117 src/net/tmwa/generalrecv.cpp:122
+#: src/net/eathena/generalrecv.cpp:74 src/net/tmwa/generalrecv.cpp:74
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:120
+#: src/net/eathena/generalrecv.cpp:77
 msgid "To many connections from same ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:123
+#: src/net/eathena/generalrecv.cpp:80
 msgid "Not paid for this time."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:83
 msgid "Pay suspended."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:129
+#: src/net/eathena/generalrecv.cpp:86
 msgid "Pay changed."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:132
+#: src/net/eathena/generalrecv.cpp:89
 msgid "Pay wrong ip."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:135
+#: src/net/eathena/generalrecv.cpp:92
 msgid "Pay game room."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:138
+#: src/net/eathena/generalrecv.cpp:95
 msgid "Disconnect forced by GM."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:142
+#: src/net/eathena/generalrecv.cpp:99
 msgid "Ban japan refuse."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:145
+#: src/net/eathena/generalrecv.cpp:102
 msgid "Remained other account."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:148
+#: src/net/eathena/generalrecv.cpp:105
 msgid "Ip unfair."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:151
+#: src/net/eathena/generalrecv.cpp:108
 msgid "Ip count all."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:154
+#: src/net/eathena/generalrecv.cpp:111
 msgid "Ip count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:158
+#: src/net/eathena/generalrecv.cpp:115
 msgid "Memory."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:161
+#: src/net/eathena/generalrecv.cpp:118
 msgid "Han valid."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:164
+#: src/net/eathena/generalrecv.cpp:121
 msgid "Ip limited access."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:167
+#: src/net/eathena/generalrecv.cpp:124
 msgid "Over characters list."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:170
+#: src/net/eathena/generalrecv.cpp:127
 msgid "Ip blocked."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:173
+#: src/net/eathena/generalrecv.cpp:130
 msgid "Invalid password count."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:176
+#: src/net/eathena/generalrecv.cpp:133
 msgid "Not allowed race."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalrecv.cpp:179 src/net/tmwa/generalrecv.cpp:126
+#: src/net/eathena/generalrecv.cpp:136 src/net/tmwa/generalrecv.cpp:78
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/eathena/generalrecv.cpp:189
+#: src/net/eathena/generalrecv.cpp:146
 msgid "Map not found"
 msgstr ""
 
@@ -8717,21 +8716,21 @@ msgid "Unknown item"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
+#: src/net/eathena/loginrecv.cpp:178 src/net/tmwa/loginrecv.cpp:107
 msgid "Account was not found. Please re-login."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
+#: src/net/eathena/loginrecv.cpp:182 src/net/tmwa/loginrecv.cpp:111
 msgid "Old password incorrect."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/loginrecv.cpp:190 src/net/tmwa/loginrecv.cpp:119
+#: src/net/eathena/loginrecv.cpp:186 src/net/tmwa/loginrecv.cpp:115
 msgid "New password too short."
 msgstr ""
 
-#: src/net/eathena/mailrecv.cpp:149
+#: src/net/eathena/mailrecv.cpp:147
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -8809,32 +8808,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:223
+#: src/net/tmwa/charserverhandler.cpp:212
 msgid "Strength:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:225
+#: src/net/tmwa/charserverhandler.cpp:214
 msgid "Agility:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:216
 msgid "Vitality:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:229
+#: src/net/tmwa/charserverhandler.cpp:218
 msgid "Intelligence:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:231
+#: src/net/tmwa/charserverhandler.cpp:220
 msgid "Dexterity:"
 msgstr ""
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:233
+#: src/net/tmwa/charserverhandler.cpp:222
 msgid "Luck:"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 444651b45..2f0d92f46 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: 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: Chinese (Taiwan) (http://www.transifex.com/akaras/manaplus/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,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 "確定"
 
@@ -257,7 +256,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1451
+#: src/actormanager.cpp:1453
 msgid "Visible on map"
 msgstr ""
 
@@ -541,12 +540,10 @@ msgstr ""
 #: 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 "錯誤"
 
@@ -1379,89 +1376,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"
@@ -1735,8 +1747,8 @@ msgstr "交易"
 #. 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 "攻擊"
 
@@ -3786,7 +3798,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
@@ -5738,10 +5750,9 @@ msgstr "開始"
 #. 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 "資訊"
 
@@ -5828,7 +5839,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 ""
@@ -8138,175 +8149,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"
@@ -8314,28 +8325,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 ""
 
@@ -8356,320 +8367,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 "和伺服器失去連線!"
+
+#: src/net/eathena/generalhandler.cpp:273 src/net/tmwa/generalhandler.cpp:297
+msgid "Strength"
+msgstr "力量"
+
+#: src/net/eathena/generalhandler.cpp:275 src/net/tmwa/generalhandler.cpp:300
+msgid "Agility"
+msgstr "敏捷"
+
+#: src/net/eathena/generalhandler.cpp:277 src/net/tmwa/generalhandler.cpp:303
+msgid "Vitality"
+msgstr "體力"
+
+#: src/net/eathena/generalhandler.cpp:279 src/net/tmwa/generalhandler.cpp:306
+msgid "Intelligence"
+msgstr "智力"
+
+#: src/net/eathena/generalhandler.cpp:281 src/net/tmwa/generalhandler.cpp:309
+msgid "Dexterity"
+msgstr "閃躲"
+
+#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:312
+msgid "Luck"
+msgstr "幸運"
+
+#. 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 "和伺服器失去連線!"
-
-#: src/net/eathena/generalhandler.cpp:384 src/net/tmwa/generalhandler.cpp:342
-msgid "Strength"
-msgstr "力量"
-
-#: src/net/eathena/generalhandler.cpp:386 src/net/tmwa/generalhandler.cpp:345
-msgid "Agility"
-msgstr "敏捷"
-
-#: src/net/eathena/generalhandler.cpp:388 src/net/tmwa/generalhandler.cpp:348
-msgid "Vitality"
-msgstr "體力"
-
-#: src/net/eathena/generalhandler.cpp:390 src/net/tmwa/generalhandler.cpp:351
-msgid "Intelligence"
-msgstr "智力"
-
-#: src/net/eathena/generalhandler.cpp:392 src/net/tmwa/generalhandler.cpp:354
-msgid "Dexterity"
-msgstr "閃躲"
-
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:357
-msgid "Luck"
-msgstr "幸運"
-
-#. 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 ""
@@ -8677,27 +8687,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 "不明的物品"
 
 #. 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 ""
@@ -8775,32 +8785,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是否接受?"
 
 #. 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 ""
author	Andrei Karas <akaras@inbox.ru>	2015-08-29 17:14:06 +0300
committer	Andrei Karas <akaras@inbox.ru>	2015-08-29 17:14:06 +0300
commit	dfea7028b3b2e3c3dad896881a705ed213730426 (patch)
tree	013216f369b54194ad415049aa22a5169336e8c4
parent	973606a6dbd201050b7d4cd0a6a782ff742056f6 (diff)
download	plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.gz plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.bz2 plus-dfea7028b3b2e3c3dad896881a705ed213730426.tar.xz plus-dfea7028b3b2e3c3dad896881a705ed213730426.zip